2009-05-18 18:42:09 +04:00
|
|
|
/*
|
|
|
|
* Commandline option parsing functions
|
|
|
|
*
|
|
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
|
|
* Copyright (c) 2009 Kevin Wolf <kwolf@redhat.com>
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2016-01-29 20:49:55 +03:00
|
|
|
#include "qemu/osdep.h"
|
2009-05-18 18:42:09 +04:00
|
|
|
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2009-05-18 18:42:09 +04:00
|
|
|
#include "qemu-common.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/error-report.h"
|
2012-12-17 21:19:43 +04:00
|
|
|
#include "qapi/qmp/types.h"
|
|
|
|
#include "qapi/qmp/qerror.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/option_int.h"
|
2016-03-20 20:16:19 +03:00
|
|
|
#include "qemu/cutils.h"
|
|
|
|
#include "qemu/id.h"
|
|
|
|
#include "qemu/help_option.h"
|
2009-05-18 18:42:09 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Extracts the name of an option from the parameter string (p points at the
|
|
|
|
* first byte of the option name)
|
|
|
|
*
|
|
|
|
* The option name is delimited by delim (usually , or =) or the string end
|
|
|
|
* and is copied into buf. If the option name is longer than buf_size, it is
|
|
|
|
* truncated. buf is always zero terminated.
|
|
|
|
*
|
|
|
|
* The return value is the position of the delimiter/zero byte after the option
|
|
|
|
* name in p.
|
|
|
|
*/
|
|
|
|
const char *get_opt_name(char *buf, int buf_size, const char *p, char delim)
|
|
|
|
{
|
|
|
|
char *q;
|
|
|
|
|
|
|
|
q = buf;
|
|
|
|
while (*p != '\0' && *p != delim) {
|
|
|
|
if (q && (q - buf) < buf_size - 1)
|
|
|
|
*q++ = *p;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
if (q)
|
|
|
|
*q = '\0';
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Extracts the value of an option from the parameter string p (p points at the
|
|
|
|
* first byte of the option value)
|
|
|
|
*
|
|
|
|
* This function is comparable to get_opt_name with the difference that the
|
|
|
|
* delimiter is fixed to be comma which starts a new option. To specify an
|
|
|
|
* option value that contains commas, double each comma.
|
|
|
|
*/
|
|
|
|
const char *get_opt_value(char *buf, int buf_size, const char *p)
|
|
|
|
{
|
|
|
|
char *q;
|
|
|
|
|
|
|
|
q = buf;
|
|
|
|
while (*p != '\0') {
|
|
|
|
if (*p == ',') {
|
|
|
|
if (*(p + 1) != ',')
|
|
|
|
break;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
if (q && (q - buf) < buf_size - 1)
|
|
|
|
*q++ = *p;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
if (q)
|
|
|
|
*q = '\0';
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2012-03-21 21:54:42 +04:00
|
|
|
static void parse_option_bool(const char *name, const char *value, bool *ret,
|
|
|
|
Error **errp)
|
2009-07-22 18:43:01 +04:00
|
|
|
{
|
2017-02-21 23:13:46 +03:00
|
|
|
if (!strcmp(value, "on")) {
|
2009-07-22 18:43:01 +04:00
|
|
|
*ret = 1;
|
2017-02-21 23:13:46 +03:00
|
|
|
} else if (!strcmp(value, "off")) {
|
|
|
|
*ret = 0;
|
|
|
|
} else {
|
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
|
|
|
name, "'on' or 'off'");
|
2009-07-22 18:43:01 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-21 21:37:44 +04:00
|
|
|
static void parse_option_number(const char *name, const char *value,
|
|
|
|
uint64_t *ret, Error **errp)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
|
|
|
uint64_t number;
|
2017-02-21 23:13:53 +03:00
|
|
|
int err;
|
2009-07-22 18:43:03 +04:00
|
|
|
|
2017-02-21 23:13:53 +03:00
|
|
|
err = qemu_strtou64(value, NULL, 0, &number);
|
|
|
|
if (err == -ERANGE) {
|
|
|
|
error_setg(errp, "Value '%s' is too large for parameter '%s'",
|
|
|
|
value, name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (err) {
|
2015-03-17 13:54:50 +03:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name, "a number");
|
2017-02-21 23:13:46 +03:00
|
|
|
return;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
2017-02-21 23:13:46 +03:00
|
|
|
*ret = number;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
|
|
|
|
2014-06-05 13:20:40 +04:00
|
|
|
static const QemuOptDesc *find_desc_by_name(const QemuOptDesc *desc,
|
|
|
|
const char *name)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; desc[i].name != NULL; i++) {
|
|
|
|
if (strcmp(desc[i].name, name) == 0) {
|
|
|
|
return &desc[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-07-29 18:47:56 +04:00
|
|
|
void parse_option_size(const char *name, const char *value,
|
|
|
|
uint64_t *ret, Error **errp)
|
2009-07-22 18:43:02 +04:00
|
|
|
{
|
2017-02-21 23:14:08 +03:00
|
|
|
uint64_t size;
|
|
|
|
int err;
|
2009-07-22 18:43:02 +04:00
|
|
|
|
2017-02-21 23:14:08 +03:00
|
|
|
err = qemu_strtosz(value, NULL, &size);
|
|
|
|
if (err == -ERANGE) {
|
2017-02-27 15:55:43 +03:00
|
|
|
error_setg(errp, "Value '%s' is out of range for parameter '%s'",
|
2017-02-21 23:14:08 +03:00
|
|
|
value, name);
|
2017-02-21 23:13:46 +03:00
|
|
|
return;
|
|
|
|
}
|
2017-02-21 23:14:08 +03:00
|
|
|
if (err) {
|
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name,
|
|
|
|
"a non-negative number below 2^64");
|
|
|
|
error_append_hint(errp, "Optional suffix k, M, G, T, P or E means"
|
|
|
|
" kilo-, mega-, giga-, tera-, peta-\n"
|
|
|
|
"and exabytes, respectively.\n");
|
2017-02-21 23:13:46 +03:00
|
|
|
return;
|
2009-07-22 18:43:02 +04:00
|
|
|
}
|
2017-02-21 23:14:08 +03:00
|
|
|
*ret = size;
|
2009-07-22 18:43:02 +04:00
|
|
|
}
|
|
|
|
|
2014-02-21 19:24:03 +04:00
|
|
|
bool has_help_option(const char *param)
|
|
|
|
{
|
|
|
|
size_t buflen = strlen(param) + 1;
|
2015-01-28 17:54:01 +03:00
|
|
|
char *buf = g_malloc(buflen);
|
2014-02-21 19:24:03 +04:00
|
|
|
const char *p = param;
|
|
|
|
bool result = false;
|
|
|
|
|
|
|
|
while (*p) {
|
|
|
|
p = get_opt_value(buf, buflen, p);
|
|
|
|
if (*p) {
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_help_option(buf)) {
|
|
|
|
result = true;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2015-01-28 17:54:02 +03:00
|
|
|
g_free(buf);
|
2014-02-21 19:24:03 +04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool is_valid_option_list(const char *param)
|
|
|
|
{
|
|
|
|
size_t buflen = strlen(param) + 1;
|
2015-01-28 17:54:01 +03:00
|
|
|
char *buf = g_malloc(buflen);
|
2014-02-21 19:24:03 +04:00
|
|
|
const char *p = param;
|
|
|
|
bool result = true;
|
|
|
|
|
|
|
|
while (*p) {
|
|
|
|
p = get_opt_value(buf, buflen, p);
|
|
|
|
if (*p && !*++p) {
|
|
|
|
result = false;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!*buf || *buf == ',') {
|
|
|
|
result = false;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2015-01-28 17:54:02 +03:00
|
|
|
g_free(buf);
|
2014-02-21 19:24:03 +04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2014-06-05 13:20:47 +04:00
|
|
|
void qemu_opts_print_help(QemuOptsList *list)
|
|
|
|
{
|
|
|
|
QemuOptDesc *desc;
|
|
|
|
|
|
|
|
assert(list);
|
|
|
|
desc = list->desc;
|
|
|
|
printf("Supported options:\n");
|
|
|
|
while (desc && desc->name) {
|
|
|
|
printf("%-16s %s\n", desc->name,
|
|
|
|
desc->help ? desc->help : "No description available");
|
|
|
|
desc++;
|
|
|
|
}
|
|
|
|
}
|
2009-07-22 18:43:03 +04:00
|
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
|
2014-06-05 13:20:58 +04:00
|
|
|
QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
|
|
|
|
2009-10-06 15:17:04 +04:00
|
|
|
QTAILQ_FOREACH_REVERSE(opt, &opts->head, QemuOptHead, next) {
|
2009-07-22 18:43:03 +04:00
|
|
|
if (strcmp(opt->name, name) != 0)
|
|
|
|
continue;
|
|
|
|
return opt;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-06-05 13:20:45 +04:00
|
|
|
static void qemu_opt_del(QemuOpt *opt)
|
|
|
|
{
|
|
|
|
QTAILQ_REMOVE(&opt->opts->head, opt, next);
|
|
|
|
g_free(opt->name);
|
|
|
|
g_free(opt->str);
|
|
|
|
g_free(opt);
|
|
|
|
}
|
|
|
|
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
/* qemu_opt_set allows many settings for the same option.
|
|
|
|
* This function deletes all settings for an option.
|
|
|
|
*/
|
|
|
|
static void qemu_opt_del_all(QemuOpts *opts, const char *name)
|
|
|
|
{
|
|
|
|
QemuOpt *opt, *next_opt;
|
|
|
|
|
|
|
|
QTAILQ_FOREACH_SAFE(opt, &opts->head, next, next_opt) {
|
|
|
|
if (!strcmp(opt->name, name)) {
|
|
|
|
qemu_opt_del(opt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-22 18:43:03 +04:00
|
|
|
const char *qemu_opt_get(QemuOpts *opts, const char *name)
|
|
|
|
{
|
2014-06-18 06:47:26 +04:00
|
|
|
QemuOpt *opt;
|
|
|
|
|
|
|
|
if (opts == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2014-06-05 13:20:42 +04:00
|
|
|
|
2014-06-18 06:47:26 +04:00
|
|
|
opt = qemu_opt_find(opts, name);
|
2014-06-05 13:20:42 +04:00
|
|
|
if (!opt) {
|
|
|
|
const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
|
|
|
|
if (desc && desc->def_value_str) {
|
|
|
|
return desc->def_value_str;
|
|
|
|
}
|
|
|
|
}
|
2009-07-22 18:43:03 +04:00
|
|
|
return opt ? opt->str : NULL;
|
|
|
|
}
|
|
|
|
|
2017-02-03 15:06:48 +03:00
|
|
|
void qemu_opt_iter_init(QemuOptsIter *iter, QemuOpts *opts, const char *name)
|
|
|
|
{
|
|
|
|
iter->opts = opts;
|
|
|
|
iter->opt = QTAILQ_FIRST(&opts->head);
|
|
|
|
iter->name = name;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *qemu_opt_iter_next(QemuOptsIter *iter)
|
|
|
|
{
|
|
|
|
QemuOpt *ret = iter->opt;
|
|
|
|
if (iter->name) {
|
|
|
|
while (ret && !g_str_equal(iter->name, ret->name)) {
|
|
|
|
ret = QTAILQ_NEXT(ret, next);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
iter->opt = ret ? QTAILQ_NEXT(ret, next) : NULL;
|
|
|
|
return ret ? ret->str : NULL;
|
|
|
|
}
|
|
|
|
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
/* Get a known option (or its default) and remove it from the list
|
|
|
|
* all in one action. Return a malloced string of the option value.
|
|
|
|
* Result must be freed by caller with g_free().
|
|
|
|
*/
|
|
|
|
char *qemu_opt_get_del(QemuOpts *opts, const char *name)
|
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
|
|
|
const QemuOptDesc *desc;
|
|
|
|
char *str = NULL;
|
|
|
|
|
|
|
|
if (opts == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
opt = qemu_opt_find(opts, name);
|
|
|
|
if (!opt) {
|
|
|
|
desc = find_desc_by_name(opts->list->desc, name);
|
|
|
|
if (desc && desc->def_value_str) {
|
|
|
|
str = g_strdup(desc->def_value_str);
|
|
|
|
}
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
str = opt->str;
|
|
|
|
opt->str = NULL;
|
|
|
|
qemu_opt_del_all(opts, name);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2012-08-02 16:45:54 +04:00
|
|
|
bool qemu_opt_has_help_opt(QemuOpts *opts)
|
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
|
|
|
|
|
|
|
QTAILQ_FOREACH_REVERSE(opt, &opts->head, QemuOptHead, next) {
|
|
|
|
if (is_help_option(opt->name)) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
static bool qemu_opt_get_bool_helper(QemuOpts *opts, const char *name,
|
|
|
|
bool defval, bool del)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
2014-06-18 06:47:26 +04:00
|
|
|
QemuOpt *opt;
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
bool ret = defval;
|
2009-07-22 18:43:03 +04:00
|
|
|
|
2014-06-18 06:47:26 +04:00
|
|
|
if (opts == NULL) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
opt = qemu_opt_find(opts, name);
|
2014-06-05 13:20:42 +04:00
|
|
|
if (opt == NULL) {
|
|
|
|
const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
|
|
|
|
if (desc && desc->def_value_str) {
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
parse_option_bool(name, desc->def_value_str, &ret, &error_abort);
|
2014-06-05 13:20:42 +04:00
|
|
|
}
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
return ret;
|
2014-06-05 13:20:42 +04:00
|
|
|
}
|
2009-07-22 18:43:03 +04:00
|
|
|
assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL);
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
ret = opt->value.boolean;
|
|
|
|
if (del) {
|
|
|
|
qemu_opt_del_all(opts, name);
|
|
|
|
}
|
|
|
|
return ret;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
|
|
|
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval)
|
|
|
|
{
|
|
|
|
return qemu_opt_get_bool_helper(opts, name, defval, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool qemu_opt_get_bool_del(QemuOpts *opts, const char *name, bool defval)
|
|
|
|
{
|
|
|
|
return qemu_opt_get_bool_helper(opts, name, defval, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint64_t qemu_opt_get_number_helper(QemuOpts *opts, const char *name,
|
|
|
|
uint64_t defval, bool del)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
2014-06-18 06:47:26 +04:00
|
|
|
QemuOpt *opt;
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
uint64_t ret = defval;
|
2009-07-22 18:43:03 +04:00
|
|
|
|
2014-06-18 06:47:26 +04:00
|
|
|
if (opts == NULL) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
opt = qemu_opt_find(opts, name);
|
2014-06-05 13:20:42 +04:00
|
|
|
if (opt == NULL) {
|
|
|
|
const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
|
|
|
|
if (desc && desc->def_value_str) {
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
parse_option_number(name, desc->def_value_str, &ret, &error_abort);
|
2014-06-05 13:20:42 +04:00
|
|
|
}
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
return ret;
|
2014-06-05 13:20:42 +04:00
|
|
|
}
|
2009-07-22 18:43:03 +04:00
|
|
|
assert(opt->desc && opt->desc->type == QEMU_OPT_NUMBER);
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
ret = opt->value.uint;
|
|
|
|
if (del) {
|
|
|
|
qemu_opt_del_all(opts, name);
|
|
|
|
}
|
|
|
|
return ret;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
|
|
|
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval)
|
|
|
|
{
|
|
|
|
return qemu_opt_get_number_helper(opts, name, defval, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t qemu_opt_get_number_del(QemuOpts *opts, const char *name,
|
|
|
|
uint64_t defval)
|
|
|
|
{
|
|
|
|
return qemu_opt_get_number_helper(opts, name, defval, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint64_t qemu_opt_get_size_helper(QemuOpts *opts, const char *name,
|
|
|
|
uint64_t defval, bool del)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
2014-06-18 06:47:26 +04:00
|
|
|
QemuOpt *opt;
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
uint64_t ret = defval;
|
2009-07-22 18:43:03 +04:00
|
|
|
|
2014-06-18 06:47:26 +04:00
|
|
|
if (opts == NULL) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
opt = qemu_opt_find(opts, name);
|
2014-06-05 13:20:42 +04:00
|
|
|
if (opt == NULL) {
|
|
|
|
const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
|
|
|
|
if (desc && desc->def_value_str) {
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
parse_option_size(name, desc->def_value_str, &ret, &error_abort);
|
2014-06-05 13:20:42 +04:00
|
|
|
}
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
return ret;
|
2014-06-05 13:20:42 +04:00
|
|
|
}
|
2009-07-22 18:43:03 +04:00
|
|
|
assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE);
|
QemuOpts: add qemu_opt_get_*_del functions for replace work
Add qemu_opt_get_del, qemu_opt_get_bool_del, qemu_opt_get_number_del and
qemu_opt_get_size_del to replace the same handling of QEMUOptionParameter
(get and delete).
Several drivers are coded to parse a known subset of options, then
remove them from the list before handing all remaining options to a
second driver for further option processing. get_*_del makes it easier
to retrieve a known option (or its default) and remove it from the list
all in one action.
Share common helper function:
For qemu_opt_get_bool/size/number, they and their get_*_del counterpart
could share most of the code except whether or not deleting the opt from
option list, so generate common helper functions.
For qemu_opt_get and qemu_opt_get_del, keep code duplication, since
1. qemu_opt_get_del returns malloc'd memory while qemu_opt_get returns
in-place memory
2. qemu_opt_get_del returns (char *), qemu_opt_get returns (const char *),
and could not change to (char *), since in one case, it will return
desc->def_value_str, which is (const char *).
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-06-05 13:20:46 +04:00
|
|
|
ret = opt->value.uint;
|
|
|
|
if (del) {
|
|
|
|
qemu_opt_del_all(opts, name);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t defval)
|
|
|
|
{
|
|
|
|
return qemu_opt_get_size_helper(opts, name, defval, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t qemu_opt_get_size_del(QemuOpts *opts, const char *name,
|
|
|
|
uint64_t defval)
|
|
|
|
{
|
|
|
|
return qemu_opt_get_size_helper(opts, name, defval, true);
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
|
|
|
|
2012-03-21 22:21:26 +04:00
|
|
|
static void qemu_opt_parse(QemuOpt *opt, Error **errp)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
|
|
|
if (opt->desc == NULL)
|
2012-03-21 22:21:26 +04:00
|
|
|
return;
|
2012-03-21 21:37:44 +04:00
|
|
|
|
2009-07-22 18:43:03 +04:00
|
|
|
switch (opt->desc->type) {
|
|
|
|
case QEMU_OPT_STRING:
|
|
|
|
/* nothing */
|
2012-03-21 22:21:26 +04:00
|
|
|
return;
|
2009-07-22 18:43:03 +04:00
|
|
|
case QEMU_OPT_BOOL:
|
2012-03-21 22:21:26 +04:00
|
|
|
parse_option_bool(opt->name, opt->str, &opt->value.boolean, errp);
|
2012-03-21 21:54:42 +04:00
|
|
|
break;
|
2009-07-22 18:43:03 +04:00
|
|
|
case QEMU_OPT_NUMBER:
|
2012-03-21 22:21:26 +04:00
|
|
|
parse_option_number(opt->name, opt->str, &opt->value.uint, errp);
|
2012-03-21 21:37:44 +04:00
|
|
|
break;
|
2009-07-22 18:43:03 +04:00
|
|
|
case QEMU_OPT_SIZE:
|
2012-03-21 22:21:26 +04:00
|
|
|
parse_option_size(opt->name, opt->str, &opt->value.uint, errp);
|
2012-03-21 22:03:45 +04:00
|
|
|
break;
|
2009-07-22 18:43:03 +04:00
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-06 10:47:18 +04:00
|
|
|
static bool opts_accepts_any(const QemuOpts *opts)
|
|
|
|
{
|
|
|
|
return opts->list->desc[0].name == NULL;
|
|
|
|
}
|
|
|
|
|
2013-07-17 16:40:37 +04:00
|
|
|
int qemu_opt_unset(QemuOpts *opts, const char *name)
|
|
|
|
{
|
|
|
|
QemuOpt *opt = qemu_opt_find(opts, name);
|
|
|
|
|
|
|
|
assert(opts_accepts_any(opts));
|
|
|
|
|
|
|
|
if (opt == NULL) {
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
qemu_opt_del(opt);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-06 10:47:18 +04:00
|
|
|
static void opt_set(QemuOpts *opts, const char *name, const char *value,
|
|
|
|
bool prepend, Error **errp)
|
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
|
|
|
const QemuOptDesc *desc;
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
desc = find_desc_by_name(opts->list->desc, name);
|
|
|
|
if (!desc && !opts_accepts_any(opts)) {
|
2015-03-17 13:54:50 +03:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER, name);
|
2012-12-06 10:47:18 +04:00
|
|
|
return;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
2009-10-06 15:17:04 +04:00
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
opt = g_malloc0(sizeof(*opt));
|
|
|
|
opt->name = g_strdup(name);
|
2009-10-06 15:17:04 +04:00
|
|
|
opt->opts = opts;
|
2012-01-27 22:54:54 +04:00
|
|
|
if (prepend) {
|
|
|
|
QTAILQ_INSERT_HEAD(&opts->head, opt, next);
|
|
|
|
} else {
|
|
|
|
QTAILQ_INSERT_TAIL(&opts->head, opt, next);
|
|
|
|
}
|
2012-12-06 10:47:18 +04:00
|
|
|
opt->desc = desc;
|
2013-01-22 14:07:57 +04:00
|
|
|
opt->str = g_strdup(value);
|
2017-02-21 23:13:46 +03:00
|
|
|
assert(opt->str);
|
2012-03-21 22:21:26 +04:00
|
|
|
qemu_opt_parse(opt, &local_err);
|
2014-01-30 18:07:28 +04:00
|
|
|
if (local_err) {
|
2012-03-21 23:13:24 +04:00
|
|
|
error_propagate(errp, local_err);
|
2009-07-22 18:43:03 +04:00
|
|
|
qemu_opt_del(opt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-12 19:52:20 +03:00
|
|
|
void qemu_opt_set(QemuOpts *opts, const char *name, const char *value,
|
|
|
|
Error **errp)
|
2012-03-21 23:17:21 +04:00
|
|
|
{
|
|
|
|
opt_set(opts, name, value, false, errp);
|
|
|
|
}
|
|
|
|
|
2015-02-12 18:37:44 +03:00
|
|
|
void qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val,
|
|
|
|
Error **errp)
|
2011-10-25 10:40:39 +04:00
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
|
|
|
const QemuOptDesc *desc = opts->list->desc;
|
|
|
|
|
2012-12-06 10:47:20 +04:00
|
|
|
opt = g_malloc0(sizeof(*opt));
|
|
|
|
opt->desc = find_desc_by_name(desc, name);
|
|
|
|
if (!opt->desc && !opts_accepts_any(opts)) {
|
2015-03-17 13:54:50 +03:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER, name);
|
2012-12-06 10:47:20 +04:00
|
|
|
g_free(opt);
|
2015-02-12 18:37:44 +03:00
|
|
|
return;
|
2011-10-25 10:40:39 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
opt->name = g_strdup(name);
|
|
|
|
opt->opts = opts;
|
|
|
|
opt->value.boolean = !!val;
|
2012-12-06 10:47:20 +04:00
|
|
|
opt->str = g_strdup(val ? "on" : "off");
|
|
|
|
QTAILQ_INSERT_TAIL(&opts->head, opt, next);
|
2011-10-25 10:40:39 +04:00
|
|
|
}
|
|
|
|
|
2015-02-12 18:46:36 +03:00
|
|
|
void qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val,
|
|
|
|
Error **errp)
|
2012-12-06 10:47:23 +04:00
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
|
|
|
const QemuOptDesc *desc = opts->list->desc;
|
|
|
|
|
|
|
|
opt = g_malloc0(sizeof(*opt));
|
|
|
|
opt->desc = find_desc_by_name(desc, name);
|
|
|
|
if (!opt->desc && !opts_accepts_any(opts)) {
|
2015-03-17 13:54:50 +03:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER, name);
|
2012-12-06 10:47:23 +04:00
|
|
|
g_free(opt);
|
2015-02-12 18:46:36 +03:00
|
|
|
return;
|
2012-12-06 10:47:23 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
opt->name = g_strdup(name);
|
|
|
|
opt->opts = opts;
|
|
|
|
opt->value.uint = val;
|
|
|
|
opt->str = g_strdup_printf("%" PRId64, val);
|
|
|
|
QTAILQ_INSERT_TAIL(&opts->head, opt, next);
|
|
|
|
}
|
|
|
|
|
2015-03-12 09:45:10 +03:00
|
|
|
/**
|
2015-03-12 10:40:25 +03:00
|
|
|
* For each member of @opts, call @func(@opaque, name, value, @errp).
|
|
|
|
* @func() may store an Error through @errp, but must return non-zero then.
|
2015-03-12 09:45:10 +03:00
|
|
|
* When @func() returns non-zero, break the loop and return that value.
|
|
|
|
* Return zero when the loop completes.
|
|
|
|
*/
|
2015-03-12 10:40:25 +03:00
|
|
|
int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,
|
|
|
|
Error **errp)
|
2009-07-31 14:25:32 +04:00
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
2015-03-12 09:45:10 +03:00
|
|
|
int rc;
|
2009-07-31 14:25:32 +04:00
|
|
|
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_FOREACH(opt, &opts->head, next) {
|
2015-03-12 10:40:25 +03:00
|
|
|
rc = func(opaque, opt->name, opt->str, errp);
|
2015-03-12 09:45:10 +03:00
|
|
|
if (rc) {
|
|
|
|
return rc;
|
|
|
|
}
|
2015-03-12 10:40:25 +03:00
|
|
|
assert(!errp || !*errp);
|
2009-07-31 14:25:32 +04:00
|
|
|
}
|
2015-03-12 09:45:10 +03:00
|
|
|
return 0;
|
2009-07-31 14:25:32 +04:00
|
|
|
}
|
|
|
|
|
2009-07-22 18:43:03 +04:00
|
|
|
QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id)
|
|
|
|
{
|
|
|
|
QemuOpts *opts;
|
|
|
|
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_FOREACH(opts, &list->head, next) {
|
2013-07-04 17:09:17 +04:00
|
|
|
if (!opts->id && !id) {
|
|
|
|
return opts;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
2013-07-04 17:09:17 +04:00
|
|
|
if (opts->id && id && !strcmp(opts->id, id)) {
|
|
|
|
return opts;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-03-20 22:51:57 +04:00
|
|
|
QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,
|
|
|
|
int fail_if_exists, Error **errp)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
|
|
|
QemuOpts *opts = NULL;
|
|
|
|
|
|
|
|
if (id) {
|
2014-09-30 15:59:30 +04:00
|
|
|
if (!id_wellformed(id)) {
|
2015-03-17 13:54:50 +03:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id",
|
|
|
|
"an identifier");
|
hmp: Allow for error message hints on HMP
Commits 7216ae3d and d2828429 disabled some error message hints,
all because a change to use modern error reporting meant that the
hint would be output prior to the actual error. Fix this by making
hints a first-class member of Error.
For example, we are now back to the pleasant:
$ qemu-system-x86_64 --nodefaults -S --vnc :0 --chardev null,id=,
qemu-system-x86_64: --chardev null,id=,: Parameter 'id' expects an identifier
Identifiers consist of letters, digits, '-', '.', '_', starting with a letter.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1441901956-21991-1-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-09-10 19:19:16 +03:00
|
|
|
error_append_hint(errp, "Identifiers consist of letters, digits, "
|
2015-12-17 19:35:14 +03:00
|
|
|
"'-', '.', '_', starting with a letter.\n");
|
2010-06-08 15:54:26 +04:00
|
|
|
return NULL;
|
|
|
|
}
|
2009-07-22 18:43:03 +04:00
|
|
|
opts = qemu_opts_find(list, id);
|
|
|
|
if (opts != NULL) {
|
2012-02-08 09:41:37 +04:00
|
|
|
if (fail_if_exists && !list->merge_lists) {
|
2014-03-22 03:42:26 +04:00
|
|
|
error_setg(errp, "Duplicate ID '%s' for %s", id, list->name);
|
2009-07-22 18:43:03 +04:00
|
|
|
return NULL;
|
|
|
|
} else {
|
|
|
|
return opts;
|
|
|
|
}
|
|
|
|
}
|
2012-02-08 09:41:37 +04:00
|
|
|
} else if (list->merge_lists) {
|
|
|
|
opts = qemu_opts_find(list, NULL);
|
|
|
|
if (opts) {
|
|
|
|
return opts;
|
|
|
|
}
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
2011-08-21 07:09:37 +04:00
|
|
|
opts = g_malloc0(sizeof(*opts));
|
2013-01-22 14:07:57 +04:00
|
|
|
opts->id = g_strdup(id);
|
2009-07-22 18:43:03 +04:00
|
|
|
opts->list = list;
|
2010-02-18 21:46:49 +03:00
|
|
|
loc_save(&opts->loc);
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_INIT(&opts->head);
|
|
|
|
QTAILQ_INSERT_TAIL(&list->head, opts, next);
|
2009-07-22 18:43:03 +04:00
|
|
|
return opts;
|
|
|
|
}
|
|
|
|
|
2010-06-01 12:47:34 +04:00
|
|
|
void qemu_opts_reset(QemuOptsList *list)
|
|
|
|
{
|
|
|
|
QemuOpts *opts, *next_opts;
|
|
|
|
|
|
|
|
QTAILQ_FOREACH_SAFE(opts, &list->head, next, next_opts) {
|
|
|
|
qemu_opts_del(opts);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-27 23:06:04 +04:00
|
|
|
void qemu_opts_loc_restore(QemuOpts *opts)
|
|
|
|
{
|
|
|
|
loc_restore(&opts->loc);
|
|
|
|
}
|
|
|
|
|
2015-02-12 19:07:34 +03:00
|
|
|
void qemu_opts_set(QemuOptsList *list, const char *id,
|
|
|
|
const char *name, const char *value, Error **errp)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
|
|
|
QemuOpts *opts;
|
2012-03-20 22:51:57 +04:00
|
|
|
Error *local_err = NULL;
|
2009-07-22 18:43:03 +04:00
|
|
|
|
2012-03-20 22:51:57 +04:00
|
|
|
opts = qemu_opts_create(list, id, 1, &local_err);
|
2014-01-30 18:07:28 +04:00
|
|
|
if (local_err) {
|
2015-02-12 19:07:34 +03:00
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
2015-02-12 19:52:20 +03:00
|
|
|
qemu_opt_set(opts, name, value, errp);
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
|
|
|
|
2009-07-31 14:25:32 +04:00
|
|
|
const char *qemu_opts_id(QemuOpts *opts)
|
|
|
|
{
|
|
|
|
return opts->id;
|
|
|
|
}
|
|
|
|
|
2013-07-11 14:52:34 +04:00
|
|
|
/* The id string will be g_free()d by qemu_opts_del */
|
|
|
|
void qemu_opts_set_id(QemuOpts *opts, char *id)
|
|
|
|
{
|
|
|
|
opts->id = id;
|
|
|
|
}
|
|
|
|
|
2009-07-22 18:43:03 +04:00
|
|
|
void qemu_opts_del(QemuOpts *opts)
|
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
|
|
|
|
2014-06-05 13:20:50 +04:00
|
|
|
if (opts == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-07-22 18:43:03 +04:00
|
|
|
for (;;) {
|
2009-09-12 11:36:22 +04:00
|
|
|
opt = QTAILQ_FIRST(&opts->head);
|
2009-07-22 18:43:03 +04:00
|
|
|
if (opt == NULL)
|
|
|
|
break;
|
|
|
|
qemu_opt_del(opt);
|
|
|
|
}
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_REMOVE(&opts->list->head, opts, next);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(opts->id);
|
|
|
|
g_free(opts);
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
|
|
|
|
2015-07-07 17:42:10 +03:00
|
|
|
/* print value, escaping any commas in value */
|
|
|
|
static void escaped_print(const char *value)
|
|
|
|
{
|
|
|
|
const char *ptr;
|
|
|
|
|
|
|
|
for (ptr = value; *ptr; ++ptr) {
|
|
|
|
if (*ptr == ',') {
|
|
|
|
putchar(',');
|
|
|
|
}
|
|
|
|
putchar(*ptr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_opts_print(QemuOpts *opts, const char *separator)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
2014-06-05 13:20:42 +04:00
|
|
|
QemuOptDesc *desc = opts->list->desc;
|
2015-07-07 17:42:10 +03:00
|
|
|
const char *sep = "";
|
|
|
|
|
|
|
|
if (opts->id) {
|
|
|
|
printf("id=%s", opts->id); /* passed id_wellformed -> no commas */
|
|
|
|
sep = separator;
|
|
|
|
}
|
2009-07-22 18:43:03 +04:00
|
|
|
|
2014-06-05 13:20:42 +04:00
|
|
|
if (desc[0].name == NULL) {
|
|
|
|
QTAILQ_FOREACH(opt, &opts->head, next) {
|
2015-07-07 17:42:10 +03:00
|
|
|
printf("%s%s=", sep, opt->name);
|
|
|
|
escaped_print(opt->str);
|
|
|
|
sep = separator;
|
2014-06-05 13:20:42 +04:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
for (; desc && desc->name; desc++) {
|
|
|
|
const char *value;
|
2017-10-05 22:07:25 +03:00
|
|
|
opt = qemu_opt_find(opts, desc->name);
|
2014-06-05 13:20:42 +04:00
|
|
|
|
|
|
|
value = opt ? opt->str : desc->def_value_str;
|
|
|
|
if (!value) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (desc->type == QEMU_OPT_STRING) {
|
2015-07-07 17:42:10 +03:00
|
|
|
printf("%s%s=", sep, desc->name);
|
|
|
|
escaped_print(value);
|
2014-06-05 13:20:42 +04:00
|
|
|
} else if ((desc->type == QEMU_OPT_SIZE ||
|
|
|
|
desc->type == QEMU_OPT_NUMBER) && opt) {
|
2014-12-09 10:38:04 +03:00
|
|
|
printf("%s%s=%" PRId64, sep, desc->name, opt->value.uint);
|
2014-06-05 13:20:42 +04:00
|
|
|
} else {
|
2014-12-09 10:38:04 +03:00
|
|
|
printf("%s%s=%s", sep, desc->name, value);
|
2014-06-05 13:20:42 +04:00
|
|
|
}
|
2015-07-07 17:42:10 +03:00
|
|
|
sep = separator;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-12 19:59:06 +03:00
|
|
|
static void opts_do_parse(QemuOpts *opts, const char *params,
|
|
|
|
const char *firstname, bool prepend, Error **errp)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
2009-12-10 13:11:08 +03:00
|
|
|
char option[128], value[1024];
|
2009-07-22 18:43:03 +04:00
|
|
|
const char *p,*pe,*pc;
|
2012-03-21 23:13:24 +04:00
|
|
|
Error *local_err = NULL;
|
2009-07-22 18:43:03 +04:00
|
|
|
|
2009-10-06 15:17:02 +04:00
|
|
|
for (p = params; *p != '\0'; p++) {
|
2009-07-22 18:43:03 +04:00
|
|
|
pe = strchr(p, '=');
|
|
|
|
pc = strchr(p, ',');
|
|
|
|
if (!pe || (pc && pc < pe)) {
|
|
|
|
/* found "foo,more" */
|
|
|
|
if (p == params && firstname) {
|
|
|
|
/* implicitly named first option */
|
|
|
|
pstrcpy(option, sizeof(option), firstname);
|
|
|
|
p = get_opt_value(value, sizeof(value), p);
|
|
|
|
} else {
|
|
|
|
/* option without value, probably a flag */
|
|
|
|
p = get_opt_name(option, sizeof(option), p, ',');
|
2009-09-10 12:58:33 +04:00
|
|
|
if (strncmp(option, "no", 2) == 0) {
|
2009-07-22 18:43:03 +04:00
|
|
|
memmove(option, option+2, strlen(option+2)+1);
|
|
|
|
pstrcpy(value, sizeof(value), "off");
|
|
|
|
} else {
|
|
|
|
pstrcpy(value, sizeof(value), "on");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* found "foo=bar,more" */
|
|
|
|
p = get_opt_name(option, sizeof(option), p, '=');
|
|
|
|
if (*p != '=') {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
p++;
|
|
|
|
p = get_opt_value(value, sizeof(value), p);
|
|
|
|
}
|
|
|
|
if (strcmp(option, "id") != 0) {
|
|
|
|
/* store and parse */
|
2012-03-21 23:13:24 +04:00
|
|
|
opt_set(opts, option, value, prepend, &local_err);
|
2014-01-30 18:07:28 +04:00
|
|
|
if (local_err) {
|
2015-02-12 19:59:06 +03:00
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (*p != ',') {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2009-09-10 12:58:33 +04:00
|
|
|
}
|
|
|
|
|
2015-02-12 20:37:11 +03:00
|
|
|
/**
|
|
|
|
* Store options parsed from @params into @opts.
|
|
|
|
* If @firstname is non-null, the first key=value in @params may omit
|
|
|
|
* key=, and is treated as if key was @firstname.
|
|
|
|
* On error, store an error object through @errp if non-null.
|
|
|
|
*/
|
|
|
|
void qemu_opts_do_parse(QemuOpts *opts, const char *params,
|
|
|
|
const char *firstname, Error **errp)
|
2012-01-27 22:54:54 +04:00
|
|
|
{
|
2015-02-12 20:37:11 +03:00
|
|
|
opts_do_parse(opts, params, firstname, false, errp);
|
2012-01-27 22:54:54 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static QemuOpts *opts_parse(QemuOptsList *list, const char *params,
|
QemuOpts: Wean off qerror_report_err()
qerror_report_err() is a transitional interface to help with
converting existing monitor commands to QMP. It should not be used
elsewhere.
The only remaining user in qemu-option.c is qemu_opts_parse(). Is it
used in QMP context? If not, we can simply replace
qerror_report_err() by error_report_err().
The uses in qemu-img.c, qemu-io.c, qemu-nbd.c and under tests/ are
clearly not in QMP context.
The uses in vl.c aren't either, because the only QMP command handlers
there are qmp_query_status() and qmp_query_machines(), and they don't
call it.
Remaining uses:
* drive_def(): Command line -drive and such, HMP drive_add and pci_add
* hmp_chardev_add(): HMP chardev-add
* monitor_parse_command(): HMP core
* tmp_config_parse(): Command line -tpmdev
* net_host_device_add(): HMP host_net_add
* net_client_parse(): Command line -net and -netdev
* qemu_global_option(): Command line -global
* vnc_parse_func(): Command line -display, -vnc, default display, HMP
change, QMP change. Bummer.
* qemu_pci_hot_add_nic(): HMP pci_add
* usb_net_init(): Command line -usbdevice, HMP usb_add
Propagate errors through qemu_opts_parse(). Create a convenience
function qemu_opts_parse_noisily() that passes errors to
error_report_err(). Switch all non-QMP users outside tests to it.
That leaves vnc_parse_func(). Propagate errors through it. Since I'm
touching it anyway, rename it to vnc_parse().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
2015-02-13 14:50:26 +03:00
|
|
|
bool permit_abbrev, bool defaults, Error **errp)
|
2009-09-10 12:58:33 +04:00
|
|
|
{
|
2010-02-10 21:52:18 +03:00
|
|
|
const char *firstname;
|
2009-12-10 13:11:08 +03:00
|
|
|
char value[1024], *id = NULL;
|
2009-09-10 12:58:33 +04:00
|
|
|
const char *p;
|
|
|
|
QemuOpts *opts;
|
2012-03-20 22:51:57 +04:00
|
|
|
Error *local_err = NULL;
|
2009-09-10 12:58:33 +04:00
|
|
|
|
2010-02-10 21:52:18 +03:00
|
|
|
assert(!permit_abbrev || list->implied_opt_name);
|
|
|
|
firstname = permit_abbrev ? list->implied_opt_name : NULL;
|
|
|
|
|
2009-09-10 12:58:33 +04:00
|
|
|
if (strncmp(params, "id=", 3) == 0) {
|
|
|
|
get_opt_value(value, sizeof(value), params+3);
|
2010-04-29 20:24:43 +04:00
|
|
|
id = value;
|
2009-09-10 12:58:33 +04:00
|
|
|
} else if ((p = strstr(params, ",id=")) != NULL) {
|
|
|
|
get_opt_value(value, sizeof(value), p+4);
|
2010-04-29 20:24:43 +04:00
|
|
|
id = value;
|
2009-09-10 12:58:33 +04:00
|
|
|
}
|
qemu-option: Guard against qemu_opts_set_defaults() misuse
Commit 6d4cd40 fixed qemu_opts_set_defaults() for an existing corner
case, but broke it for another one that can't be reached in current
code.
Quote from its commit message:
I believe [opts_parse()] attempts to do the following:
If options don't yet exist, create new options
Else, if defaults, modify the existing options
Else, if list->merge_lists, modify the existing options
Else, fail
The only caller that passes true for defaults is
qemu_opts_set_defaults().
The commit message then claims:
A straightforward call of qemu_opts_create() does exactly that.
Wrong. When !list->merge_lists, and the option string doesn't contain
id=, and options without ID exist, then we don't actually modify the
existing options, we create new ones.
Not reachable, because we never pass lists with !list->merge_lists to
qemu_opts_set_defaults().
Guard against possible (if unlikely) future misuse with assert().
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1375428840-5275-1-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-08-02 11:34:00 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This code doesn't work for defaults && !list->merge_lists: when
|
|
|
|
* params has no id=, and list has an element with !opts->id, it
|
|
|
|
* appends a new element instead of returning the existing opts.
|
|
|
|
* However, we got no use for this case. Guard against possible
|
|
|
|
* (if unlikely) future misuse:
|
|
|
|
*/
|
|
|
|
assert(!defaults || list->merge_lists);
|
qemu-option: Fix qemu_opts_set_defaults() for corner cases
Commit 4f6dd9a changed the initialization of opts in opts_parse() to
this:
if (defaults) {
if (!id && !QTAILQ_EMPTY(&list->head)) {
opts = qemu_opts_find(list, NULL);
} else {
opts = qemu_opts_create(list, id, 0);
}
} else {
opts = qemu_opts_create(list, id, 1);
}
Same as before for !defaults.
If defaults is true, and params has no ID, and options exist, we use
the first assignment. It sets opts to null if all options have an ID.
opts_parse() then returns null. qemu_opts_set_defaults() asserts the
value is non-null. It's the only caller that passes true for
defaults.
To reproduce, try "-M xenpv -machine id=foo" (yes, "id=foo" is silly,
but it shouldn't crash).
I believe the function attempts to do the following:
If options don't yet exist, create new options
Else, if defaults, modify the existing options
Else, if list->merge_lists, modify the existing options
Else, fail
A straightforward call of qemu_opts_create() does exactly that.
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1372943363-24081-3-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-07-04 17:09:18 +04:00
|
|
|
opts = qemu_opts_create(list, id, !defaults, &local_err);
|
2012-03-20 22:51:57 +04:00
|
|
|
if (opts == NULL) {
|
2015-02-12 20:24:10 +03:00
|
|
|
error_propagate(errp, local_err);
|
2009-09-10 12:58:33 +04:00
|
|
|
return NULL;
|
2012-03-20 22:51:57 +04:00
|
|
|
}
|
2009-09-10 12:58:33 +04:00
|
|
|
|
2015-02-12 19:59:06 +03:00
|
|
|
opts_do_parse(opts, params, firstname, defaults, &local_err);
|
|
|
|
if (local_err) {
|
2015-02-12 20:24:10 +03:00
|
|
|
error_propagate(errp, local_err);
|
2009-09-10 12:58:33 +04:00
|
|
|
qemu_opts_del(opts);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-07-22 18:43:03 +04:00
|
|
|
return opts;
|
|
|
|
}
|
|
|
|
|
2015-02-12 20:24:10 +03:00
|
|
|
/**
|
|
|
|
* Create a QemuOpts in @list and with options parsed from @params.
|
|
|
|
* If @permit_abbrev, the first key=value in @params may omit key=,
|
|
|
|
* and is treated as if key was @list->implied_opt_name.
|
QemuOpts: Wean off qerror_report_err()
qerror_report_err() is a transitional interface to help with
converting existing monitor commands to QMP. It should not be used
elsewhere.
The only remaining user in qemu-option.c is qemu_opts_parse(). Is it
used in QMP context? If not, we can simply replace
qerror_report_err() by error_report_err().
The uses in qemu-img.c, qemu-io.c, qemu-nbd.c and under tests/ are
clearly not in QMP context.
The uses in vl.c aren't either, because the only QMP command handlers
there are qmp_query_status() and qmp_query_machines(), and they don't
call it.
Remaining uses:
* drive_def(): Command line -drive and such, HMP drive_add and pci_add
* hmp_chardev_add(): HMP chardev-add
* monitor_parse_command(): HMP core
* tmp_config_parse(): Command line -tpmdev
* net_host_device_add(): HMP host_net_add
* net_client_parse(): Command line -net and -netdev
* qemu_global_option(): Command line -global
* vnc_parse_func(): Command line -display, -vnc, default display, HMP
change, QMP change. Bummer.
* qemu_pci_hot_add_nic(): HMP pci_add
* usb_net_init(): Command line -usbdevice, HMP usb_add
Propagate errors through qemu_opts_parse(). Create a convenience
function qemu_opts_parse_noisily() that passes errors to
error_report_err(). Switch all non-QMP users outside tests to it.
That leaves vnc_parse_func(). Propagate errors through it. Since I'm
touching it anyway, rename it to vnc_parse().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
2015-02-13 14:50:26 +03:00
|
|
|
* On error, store an error object through @errp if non-null.
|
2015-02-12 20:24:10 +03:00
|
|
|
* Return the new QemuOpts on success, null pointer on error.
|
|
|
|
*/
|
2012-01-27 22:54:54 +04:00
|
|
|
QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params,
|
QemuOpts: Wean off qerror_report_err()
qerror_report_err() is a transitional interface to help with
converting existing monitor commands to QMP. It should not be used
elsewhere.
The only remaining user in qemu-option.c is qemu_opts_parse(). Is it
used in QMP context? If not, we can simply replace
qerror_report_err() by error_report_err().
The uses in qemu-img.c, qemu-io.c, qemu-nbd.c and under tests/ are
clearly not in QMP context.
The uses in vl.c aren't either, because the only QMP command handlers
there are qmp_query_status() and qmp_query_machines(), and they don't
call it.
Remaining uses:
* drive_def(): Command line -drive and such, HMP drive_add and pci_add
* hmp_chardev_add(): HMP chardev-add
* monitor_parse_command(): HMP core
* tmp_config_parse(): Command line -tpmdev
* net_host_device_add(): HMP host_net_add
* net_client_parse(): Command line -net and -netdev
* qemu_global_option(): Command line -global
* vnc_parse_func(): Command line -display, -vnc, default display, HMP
change, QMP change. Bummer.
* qemu_pci_hot_add_nic(): HMP pci_add
* usb_net_init(): Command line -usbdevice, HMP usb_add
Propagate errors through qemu_opts_parse(). Create a convenience
function qemu_opts_parse_noisily() that passes errors to
error_report_err(). Switch all non-QMP users outside tests to it.
That leaves vnc_parse_func(). Propagate errors through it. Since I'm
touching it anyway, rename it to vnc_parse().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
2015-02-13 14:50:26 +03:00
|
|
|
bool permit_abbrev, Error **errp)
|
|
|
|
{
|
|
|
|
return opts_parse(list, params, permit_abbrev, false, errp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Create a QemuOpts in @list and with options parsed from @params.
|
|
|
|
* If @permit_abbrev, the first key=value in @params may omit key=,
|
|
|
|
* and is treated as if key was @list->implied_opt_name.
|
|
|
|
* Report errors with error_report_err(). This is inappropriate in
|
|
|
|
* QMP context. Do not use this function there!
|
|
|
|
* Return the new QemuOpts on success, null pointer on error.
|
|
|
|
*/
|
|
|
|
QemuOpts *qemu_opts_parse_noisily(QemuOptsList *list, const char *params,
|
|
|
|
bool permit_abbrev)
|
2012-01-27 22:54:54 +04:00
|
|
|
{
|
2015-02-12 20:24:10 +03:00
|
|
|
Error *err = NULL;
|
|
|
|
QemuOpts *opts;
|
|
|
|
|
|
|
|
opts = opts_parse(list, params, permit_abbrev, false, &err);
|
QemuOpts: Wean off qerror_report_err()
qerror_report_err() is a transitional interface to help with
converting existing monitor commands to QMP. It should not be used
elsewhere.
The only remaining user in qemu-option.c is qemu_opts_parse(). Is it
used in QMP context? If not, we can simply replace
qerror_report_err() by error_report_err().
The uses in qemu-img.c, qemu-io.c, qemu-nbd.c and under tests/ are
clearly not in QMP context.
The uses in vl.c aren't either, because the only QMP command handlers
there are qmp_query_status() and qmp_query_machines(), and they don't
call it.
Remaining uses:
* drive_def(): Command line -drive and such, HMP drive_add and pci_add
* hmp_chardev_add(): HMP chardev-add
* monitor_parse_command(): HMP core
* tmp_config_parse(): Command line -tpmdev
* net_host_device_add(): HMP host_net_add
* net_client_parse(): Command line -net and -netdev
* qemu_global_option(): Command line -global
* vnc_parse_func(): Command line -display, -vnc, default display, HMP
change, QMP change. Bummer.
* qemu_pci_hot_add_nic(): HMP pci_add
* usb_net_init(): Command line -usbdevice, HMP usb_add
Propagate errors through qemu_opts_parse(). Create a convenience
function qemu_opts_parse_noisily() that passes errors to
error_report_err(). Switch all non-QMP users outside tests to it.
That leaves vnc_parse_func(). Propagate errors through it. Since I'm
touching it anyway, rename it to vnc_parse().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
2015-02-13 14:50:26 +03:00
|
|
|
if (err) {
|
|
|
|
error_report_err(err);
|
2015-02-12 20:24:10 +03:00
|
|
|
}
|
|
|
|
return opts;
|
2012-01-27 22:54:54 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_opts_set_defaults(QemuOptsList *list, const char *params,
|
|
|
|
int permit_abbrev)
|
|
|
|
{
|
|
|
|
QemuOpts *opts;
|
|
|
|
|
2015-02-12 20:24:10 +03:00
|
|
|
opts = opts_parse(list, params, permit_abbrev, true, NULL);
|
2012-01-27 22:54:54 +04:00
|
|
|
assert(opts);
|
|
|
|
}
|
|
|
|
|
2012-04-19 00:24:01 +04:00
|
|
|
typedef struct OptsFromQDictState {
|
|
|
|
QemuOpts *opts;
|
|
|
|
Error **errp;
|
|
|
|
} OptsFromQDictState;
|
|
|
|
|
2010-02-10 22:15:29 +03:00
|
|
|
static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque)
|
|
|
|
{
|
2012-04-19 00:24:01 +04:00
|
|
|
OptsFromQDictState *state = opaque;
|
2017-06-07 19:35:58 +03:00
|
|
|
char buf[32], *tmp = NULL;
|
2010-02-10 22:15:29 +03:00
|
|
|
const char *value;
|
|
|
|
|
2014-05-02 15:26:40 +04:00
|
|
|
if (!strcmp(key, "id") || *state->errp) {
|
2010-02-10 22:15:29 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (qobject_type(obj)) {
|
|
|
|
case QTYPE_QSTRING:
|
|
|
|
value = qstring_get_str(qobject_to_qstring(obj));
|
|
|
|
break;
|
2017-06-07 19:35:58 +03:00
|
|
|
case QTYPE_QNUM:
|
|
|
|
tmp = qnum_to_string(qobject_to_qnum(obj));
|
|
|
|
value = tmp;
|
2010-02-10 22:15:29 +03:00
|
|
|
break;
|
|
|
|
case QTYPE_QBOOL:
|
2010-03-18 23:48:19 +03:00
|
|
|
pstrcpy(buf, sizeof(buf),
|
2015-05-16 01:24:59 +03:00
|
|
|
qbool_get_bool(qobject_to_qbool(obj)) ? "on" : "off");
|
2010-02-10 22:15:29 +03:00
|
|
|
value = buf;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
2012-04-19 00:24:01 +04:00
|
|
|
|
2015-02-12 19:52:20 +03:00
|
|
|
qemu_opt_set(state->opts, key, value, state->errp);
|
2017-06-07 19:35:58 +03:00
|
|
|
g_free(tmp);
|
2010-02-10 22:15:29 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create QemuOpts from a QDict.
|
2017-06-07 19:35:58 +03:00
|
|
|
* Use value of key "id" as ID if it exists and is a QString. Only
|
|
|
|
* QStrings, QNums and QBools are copied. Entries with other types
|
|
|
|
* are silently ignored.
|
2010-02-10 22:15:29 +03:00
|
|
|
*/
|
2012-04-19 00:24:01 +04:00
|
|
|
QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict,
|
|
|
|
Error **errp)
|
2010-02-10 22:15:29 +03:00
|
|
|
{
|
2012-04-19 00:24:01 +04:00
|
|
|
OptsFromQDictState state;
|
2012-03-20 22:51:57 +04:00
|
|
|
Error *local_err = NULL;
|
2012-04-19 00:24:01 +04:00
|
|
|
QemuOpts *opts;
|
2010-02-10 22:15:29 +03:00
|
|
|
|
2012-03-20 22:51:57 +04:00
|
|
|
opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1,
|
|
|
|
&local_err);
|
2014-01-30 18:07:28 +04:00
|
|
|
if (local_err) {
|
2012-04-19 00:24:01 +04:00
|
|
|
error_propagate(errp, local_err);
|
2010-02-10 22:15:29 +03:00
|
|
|
return NULL;
|
2012-03-20 22:51:57 +04:00
|
|
|
}
|
2010-02-10 22:15:29 +03:00
|
|
|
|
2012-03-20 22:51:57 +04:00
|
|
|
assert(opts != NULL);
|
2012-04-19 00:24:01 +04:00
|
|
|
|
|
|
|
state.errp = &local_err;
|
|
|
|
state.opts = opts;
|
|
|
|
qdict_iter(qdict, qemu_opts_from_qdict_1, &state);
|
2014-01-30 18:07:28 +04:00
|
|
|
if (local_err) {
|
2012-04-19 00:24:01 +04:00
|
|
|
error_propagate(errp, local_err);
|
|
|
|
qemu_opts_del(opts);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2010-02-10 22:15:29 +03:00
|
|
|
return opts;
|
|
|
|
}
|
|
|
|
|
2013-03-15 13:35:05 +04:00
|
|
|
/*
|
|
|
|
* Adds all QDict entries to the QemuOpts that can be added and removes them
|
|
|
|
* from the QDict. When this function returns, the QDict contains only those
|
|
|
|
* entries that couldn't be added to the QemuOpts.
|
|
|
|
*/
|
|
|
|
void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp)
|
|
|
|
{
|
|
|
|
const QDictEntry *entry, *next;
|
|
|
|
|
|
|
|
entry = qdict_first(qdict);
|
|
|
|
|
|
|
|
while (entry != NULL) {
|
|
|
|
Error *local_err = NULL;
|
|
|
|
OptsFromQDictState state = {
|
|
|
|
.errp = &local_err,
|
|
|
|
.opts = opts,
|
|
|
|
};
|
|
|
|
|
|
|
|
next = qdict_next(qdict, entry);
|
|
|
|
|
|
|
|
if (find_desc_by_name(opts->list->desc, entry->key)) {
|
|
|
|
qemu_opts_from_qdict_1(entry->key, entry->value, &state);
|
2014-01-30 18:07:28 +04:00
|
|
|
if (local_err) {
|
2013-03-15 13:35:05 +04:00
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
qdict_del(qdict, entry->key);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
entry = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-02-10 22:15:29 +03:00
|
|
|
/*
|
|
|
|
* Convert from QemuOpts to QDict.
|
|
|
|
* The QDict values are of type QString.
|
|
|
|
* TODO We'll want to use types appropriate for opt->desc->type, but
|
|
|
|
* this is enough for now.
|
|
|
|
*/
|
|
|
|
QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict)
|
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
|
|
|
|
|
|
|
if (!qdict) {
|
|
|
|
qdict = qdict_new();
|
|
|
|
}
|
|
|
|
if (opts->id) {
|
2017-04-28 00:58:17 +03:00
|
|
|
qdict_put_str(qdict, "id", opts->id);
|
2010-02-10 22:15:29 +03:00
|
|
|
}
|
|
|
|
QTAILQ_FOREACH(opt, &opts->head, next) {
|
2017-04-28 00:58:19 +03:00
|
|
|
qdict_put_str(qdict, opt->name, opt->str);
|
2010-02-10 22:15:29 +03:00
|
|
|
}
|
|
|
|
return qdict;
|
|
|
|
}
|
|
|
|
|
2009-10-06 15:17:03 +04:00
|
|
|
/* Validate parsed opts against descriptions where no
|
|
|
|
* descriptions were provided in the QemuOptsList.
|
|
|
|
*/
|
2012-04-12 18:58:57 +04:00
|
|
|
void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp)
|
2009-10-06 15:17:03 +04:00
|
|
|
{
|
|
|
|
QemuOpt *opt;
|
2012-03-21 22:21:26 +04:00
|
|
|
Error *local_err = NULL;
|
2009-10-06 15:17:03 +04:00
|
|
|
|
2012-12-06 10:47:19 +04:00
|
|
|
assert(opts_accepts_any(opts));
|
2009-10-06 15:17:03 +04:00
|
|
|
|
|
|
|
QTAILQ_FOREACH(opt, &opts->head, next) {
|
2012-12-06 10:47:19 +04:00
|
|
|
opt->desc = find_desc_by_name(desc, opt->name);
|
|
|
|
if (!opt->desc) {
|
2015-03-17 13:54:50 +03:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER, opt->name);
|
2012-04-12 18:58:57 +04:00
|
|
|
return;
|
2009-10-06 15:17:03 +04:00
|
|
|
}
|
|
|
|
|
2012-03-21 22:21:26 +04:00
|
|
|
qemu_opt_parse(opt, &local_err);
|
2014-01-30 18:07:28 +04:00
|
|
|
if (local_err) {
|
2012-04-12 18:58:57 +04:00
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
2009-10-06 15:17:03 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-13 13:07:24 +03:00
|
|
|
/**
|
2015-03-13 15:35:14 +03:00
|
|
|
* For each member of @list, call @func(@opaque, member, @errp).
|
2015-03-13 13:07:24 +03:00
|
|
|
* Call it with the current location temporarily set to the member's.
|
2015-03-13 15:35:14 +03:00
|
|
|
* @func() may store an Error through @errp, but must return non-zero then.
|
2015-03-13 13:07:24 +03:00
|
|
|
* When @func() returns non-zero, break the loop and return that value.
|
|
|
|
* Return zero when the loop completes.
|
|
|
|
*/
|
|
|
|
int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,
|
2015-03-13 15:35:14 +03:00
|
|
|
void *opaque, Error **errp)
|
2009-07-22 18:43:03 +04:00
|
|
|
{
|
2010-02-18 21:46:49 +03:00
|
|
|
Location loc;
|
2009-07-22 18:43:03 +04:00
|
|
|
QemuOpts *opts;
|
QemuOpts: Fix qemu_opts_foreach() dangling location regression
qemu_opts_foreach() pushes and pops a Location with automatic storage
duration. Except it fails to pop when @func() returns non-zero.
cur_loc then points to unused stack space, and will most likely get
clobbered in short order.
Clobbered cur_loc can make loc_pop() and error_print_loc() crash or
report bogus locations.
Affects several qemu command line options as well as qemu-img,
qemu-io, qemu-nbd -object, and blkdebug's configuration file.
Broken in commit a4c7367, v2.4.0.
Reproducer:
$ qemu-system-x86_64 -nodefaults -display none -object secret,id=foo,foo=bar
main() reports "Property '.foo' not found" like this:
if (qemu_opts_foreach(qemu_find_opts("object"),
user_creatable_add_opts_foreach,
object_create_delayed, &err)) {
error_report_err(err);
exit(1);
}
cur_loc then points to where qemu_opts_foreach()'s Location used to
be, i.e. unused stack space. With optimization, this Location doesn't
get clobbered for me, and also happens to be the correct location.
Without optimization, it does get clobbered in a way that makes
error_report_err() report no location.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1461767349-15329-2-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
2016-04-27 17:29:07 +03:00
|
|
|
int rc = 0;
|
2009-07-22 18:43:03 +04:00
|
|
|
|
2010-02-18 21:46:49 +03:00
|
|
|
loc_push_none(&loc);
|
2009-09-12 11:36:22 +04:00
|
|
|
QTAILQ_FOREACH(opts, &list->head, next) {
|
2010-02-18 21:46:49 +03:00
|
|
|
loc_restore(&opts->loc);
|
2015-03-13 15:35:14 +03:00
|
|
|
rc = func(opaque, opts, errp);
|
2015-03-13 13:07:24 +03:00
|
|
|
if (rc) {
|
QemuOpts: Fix qemu_opts_foreach() dangling location regression
qemu_opts_foreach() pushes and pops a Location with automatic storage
duration. Except it fails to pop when @func() returns non-zero.
cur_loc then points to unused stack space, and will most likely get
clobbered in short order.
Clobbered cur_loc can make loc_pop() and error_print_loc() crash or
report bogus locations.
Affects several qemu command line options as well as qemu-img,
qemu-io, qemu-nbd -object, and blkdebug's configuration file.
Broken in commit a4c7367, v2.4.0.
Reproducer:
$ qemu-system-x86_64 -nodefaults -display none -object secret,id=foo,foo=bar
main() reports "Property '.foo' not found" like this:
if (qemu_opts_foreach(qemu_find_opts("object"),
user_creatable_add_opts_foreach,
object_create_delayed, &err)) {
error_report_err(err);
exit(1);
}
cur_loc then points to where qemu_opts_foreach()'s Location used to
be, i.e. unused stack space. With optimization, this Location doesn't
get clobbered for me, and also happens to be the correct location.
Without optimization, it does get clobbered in a way that makes
error_report_err() report no location.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1461767349-15329-2-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
2016-04-27 17:29:07 +03:00
|
|
|
break;
|
2015-03-13 13:07:24 +03:00
|
|
|
}
|
2015-03-13 15:35:14 +03:00
|
|
|
assert(!errp || !*errp);
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
2010-02-18 21:46:49 +03:00
|
|
|
loc_pop(&loc);
|
QemuOpts: Fix qemu_opts_foreach() dangling location regression
qemu_opts_foreach() pushes and pops a Location with automatic storage
duration. Except it fails to pop when @func() returns non-zero.
cur_loc then points to unused stack space, and will most likely get
clobbered in short order.
Clobbered cur_loc can make loc_pop() and error_print_loc() crash or
report bogus locations.
Affects several qemu command line options as well as qemu-img,
qemu-io, qemu-nbd -object, and blkdebug's configuration file.
Broken in commit a4c7367, v2.4.0.
Reproducer:
$ qemu-system-x86_64 -nodefaults -display none -object secret,id=foo,foo=bar
main() reports "Property '.foo' not found" like this:
if (qemu_opts_foreach(qemu_find_opts("object"),
user_creatable_add_opts_foreach,
object_create_delayed, &err)) {
error_report_err(err);
exit(1);
}
cur_loc then points to where qemu_opts_foreach()'s Location used to
be, i.e. unused stack space. With optimization, this Location doesn't
get clobbered for me, and also happens to be the correct location.
Without optimization, it does get clobbered in a way that makes
error_report_err() report no location.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1461767349-15329-2-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
2016-04-27 17:29:07 +03:00
|
|
|
return rc;
|
2009-07-22 18:43:03 +04:00
|
|
|
}
|
2014-06-05 13:20:48 +04:00
|
|
|
|
|
|
|
static size_t count_opts_list(QemuOptsList *list)
|
|
|
|
{
|
|
|
|
QemuOptDesc *desc = NULL;
|
|
|
|
size_t num_opts = 0;
|
|
|
|
|
|
|
|
if (!list) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
desc = list->desc;
|
|
|
|
while (desc && desc->name) {
|
|
|
|
num_opts++;
|
|
|
|
desc++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return num_opts;
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_opts_free(QemuOptsList *list)
|
|
|
|
{
|
|
|
|
g_free(list);
|
|
|
|
}
|
2014-06-05 13:20:49 +04:00
|
|
|
|
2014-06-05 13:21:11 +04:00
|
|
|
/* Realloc dst option list and append options from an option list (list)
|
|
|
|
* to it. dst could be NULL or a malloced list.
|
2014-06-05 13:21:12 +04:00
|
|
|
* The lifetime of dst must be shorter than the input list because the
|
|
|
|
* QemuOptDesc->name, ->help, and ->def_value_str strings are shared.
|
2014-06-05 13:20:49 +04:00
|
|
|
*/
|
|
|
|
QemuOptsList *qemu_opts_append(QemuOptsList *dst,
|
2014-06-05 13:21:11 +04:00
|
|
|
QemuOptsList *list)
|
2014-06-05 13:20:49 +04:00
|
|
|
{
|
|
|
|
size_t num_opts, num_dst_opts;
|
|
|
|
QemuOptDesc *desc;
|
|
|
|
bool need_init = false;
|
2014-06-25 12:38:41 +04:00
|
|
|
bool need_head_update;
|
2014-06-05 13:20:49 +04:00
|
|
|
|
2014-06-05 13:21:11 +04:00
|
|
|
if (!list) {
|
2014-06-05 13:20:49 +04:00
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If dst is NULL, after realloc, some area of dst should be initialized
|
|
|
|
* before adding options to it.
|
|
|
|
*/
|
|
|
|
if (!dst) {
|
|
|
|
need_init = true;
|
2014-06-25 12:38:41 +04:00
|
|
|
need_head_update = true;
|
|
|
|
} else {
|
|
|
|
/* Moreover, even if dst is not NULL, the realloc may move it to a
|
|
|
|
* different address in which case we may get a stale tail pointer
|
|
|
|
* in dst->head. */
|
|
|
|
need_head_update = QTAILQ_EMPTY(&dst->head);
|
2014-06-05 13:20:49 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
num_opts = count_opts_list(dst);
|
|
|
|
num_dst_opts = num_opts;
|
|
|
|
num_opts += count_opts_list(list);
|
|
|
|
dst = g_realloc(dst, sizeof(QemuOptsList) +
|
|
|
|
(num_opts + 1) * sizeof(QemuOptDesc));
|
|
|
|
if (need_init) {
|
|
|
|
dst->name = NULL;
|
|
|
|
dst->implied_opt_name = NULL;
|
|
|
|
dst->merge_lists = false;
|
|
|
|
}
|
2014-06-25 12:38:41 +04:00
|
|
|
if (need_head_update) {
|
|
|
|
QTAILQ_INIT(&dst->head);
|
|
|
|
}
|
2014-06-05 13:20:49 +04:00
|
|
|
dst->desc[num_dst_opts].name = NULL;
|
|
|
|
|
|
|
|
/* append list->desc to dst->desc */
|
|
|
|
if (list) {
|
|
|
|
desc = list->desc;
|
|
|
|
while (desc && desc->name) {
|
|
|
|
if (find_desc_by_name(dst->desc, desc->name) == NULL) {
|
2014-06-05 13:21:12 +04:00
|
|
|
dst->desc[num_dst_opts++] = *desc;
|
2014-06-05 13:20:49 +04:00
|
|
|
dst->desc[num_dst_opts].name = NULL;
|
|
|
|
}
|
|
|
|
desc++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return dst;
|
|
|
|
}
|