#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qapi/qmp/qbool.h"
#include "qapi/qmp/qdict.h"
*ret = size;
}
-bool has_help_option(const char *param)
-{
- const char *p = param;
- bool result = false;
-
- while (*p && !result) {
- char *value;
-
- p = get_opt_value(p, &value);
- if (*p) {
- p++;
- }
-
- result = is_help_option(value);
- g_free(value);
- }
-
- return result;
-}
-
-bool is_valid_option_list(const char *p)
-{
- char *value = NULL;
- bool result = false;
-
- while (*p) {
- p = get_opt_value(p, &value);
- if ((*p && !*++p) ||
- (!*value || *value == ',')) {
- goto out;
- }
-
- g_free(value);
- value = NULL;
- }
-
- result = true;
-out:
- g_free(value);
- return result;
-}
-
static const char *opt_type_to_string(enum QemuOptType type)
{
switch (type) {
}
static void opt_set(QemuOpts *opts, const char *name, char *value,
- bool prepend, bool *invalidp, Error **errp)
+ bool prepend, bool *help_wanted, Error **errp)
{
QemuOpt *opt;
const QemuOptDesc *desc;
if (!desc && !opts_accepts_any(opts)) {
g_free(value);
error_setg(errp, QERR_INVALID_PARAMETER, name);
- if (invalidp) {
- *invalidp = true;
+ if (help_wanted && is_help_option(name)) {
+ *help_wanted = true;
}
return;
}
}
}
+static const char *get_opt_name_value(const char *params,
+ const char *firstname,
+ char **name, char **value)
+{
+ const char *p, *pe, *pc;
+
+ pe = strchr(params, '=');
+ pc = strchr(params, ',');
+
+ if (!pe || (pc && pc < pe)) {
+ /* found "foo,more" */
+ if (firstname) {
+ /* implicitly named first option */
+ *name = g_strdup(firstname);
+ p = get_opt_value(params, value);
+ } else {
+ /* option without value, must be a flag */
+ p = get_opt_name(params, name, ',');
+ if (strncmp(*name, "no", 2) == 0) {
+ memmove(*name, *name + 2, strlen(*name + 2) + 1);
+ *value = g_strdup("off");
+ } else {
+ *value = g_strdup("on");
+ }
+ }
+ } else {
+ /* found "foo=bar,more" */
+ p = get_opt_name(params, name, '=');
+ assert(*p == '=');
+ p++;
+ p = get_opt_value(p, value);
+ }
+
+ assert(!*p || *p == ',');
+ if (*p == ',') {
+ p++;
+ }
+ return p;
+}
+
static void opts_do_parse(QemuOpts *opts, const char *params,
const char *firstname, bool prepend,
- bool *invalidp, Error **errp)
+ bool *help_wanted, Error **errp)
{
- char *option = NULL;
- char *value = NULL;
- const char *p,*pe,*pc;
Error *local_err = NULL;
+ char *option, *value;
+ const char *p;
- for (p = params; *p != '\0'; p++) {
- pe = strchr(p, '=');
- pc = strchr(p, ',');
- if (!pe || (pc && pc < pe)) {
- /* found "foo,more" */
- if (p == params && firstname) {
- /* implicitly named first option */
- option = g_strdup(firstname);
- p = get_opt_value(p, &value);
- } else {
- /* option without value, probably a flag */
- p = get_opt_name(p, &option, ',');
- if (strncmp(option, "no", 2) == 0) {
- memmove(option, option+2, strlen(option+2)+1);
- value = g_strdup("off");
- } else {
- value = g_strdup("on");
- }
- }
- } else {
- /* found "foo=bar,more" */
- p = get_opt_name(p, &option, '=');
- assert(*p == '=');
- p++;
- p = get_opt_value(p, &value);
+ for (p = params; *p;) {
+ p = get_opt_name_value(p, firstname, &option, &value);
+ firstname = NULL;
+
+ if (!strcmp(option, "id")) {
+ g_free(option);
+ g_free(value);
+ continue;
}
- if (strcmp(option, "id") != 0) {
- /* store and parse */
- opt_set(opts, option, value, prepend, invalidp, &local_err);
- value = NULL;
- if (local_err) {
- error_propagate(errp, local_err);
- goto cleanup;
- }
+
+ opt_set(opts, option, value, prepend, help_wanted, &local_err);
+ g_free(option);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
}
- if (*p != ',') {
- break;
+ }
+}
+
+static char *opts_parse_id(const char *params)
+{
+ const char *p;
+ char *name, *value;
+
+ for (p = params; *p;) {
+ p = get_opt_name_value(p, NULL, &name, &value);
+ if (!strcmp(name, "id")) {
+ g_free(name);
+ return value;
}
- g_free(option);
+ g_free(name);
+ g_free(value);
+ }
+
+ return NULL;
+}
+
+bool has_help_option(const char *params)
+{
+ const char *p;
+ char *name, *value;
+ bool ret;
+
+ for (p = params; *p;) {
+ p = get_opt_name_value(p, NULL, &name, &value);
+ ret = is_help_option(name);
+ g_free(name);
g_free(value);
- option = value = NULL;
+ if (ret) {
+ return true;
+ }
}
- cleanup:
- g_free(option);
- g_free(value);
+ return false;
}
/**
static QemuOpts *opts_parse(QemuOptsList *list, const char *params,
bool permit_abbrev, bool defaults,
- bool *invalidp, Error **errp)
+ bool *help_wanted, Error **errp)
{
const char *firstname;
- char *id = NULL;
- const char *p;
+ char *id = opts_parse_id(params);
QemuOpts *opts;
Error *local_err = NULL;
assert(!permit_abbrev || list->implied_opt_name);
firstname = permit_abbrev ? list->implied_opt_name : NULL;
- if (strncmp(params, "id=", 3) == 0) {
- get_opt_value(params + 3, &id);
- } else if ((p = strstr(params, ",id=")) != NULL) {
- get_opt_value(p + 4, &id);
- }
-
/*
* This code doesn't work for defaults && !list->merge_lists: when
* params has no id=, and list has an element with !opts->id, it
return NULL;
}
- opts_do_parse(opts, params, firstname, defaults, invalidp, &local_err);
+ opts_do_parse(opts, params, firstname, defaults, help_wanted, &local_err);
if (local_err) {
error_propagate(errp, local_err);
qemu_opts_del(opts);
{
Error *err = NULL;
QemuOpts *opts;
- bool invalidp = false;
+ bool help_wanted = false;
- opts = opts_parse(list, params, permit_abbrev, false, &invalidp, &err);
+ opts = opts_parse(list, params, permit_abbrev, false, &help_wanted, &err);
if (err) {
- if (invalidp && has_help_option(params)) {
+ if (help_wanted) {
qemu_opts_print_help(list, true);
error_free(err);
} else {
assert(opts);
}
-typedef struct OptsFromQDictState {
- QemuOpts *opts;
- Error **errp;
-} OptsFromQDictState;
-
-static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque)
+static void qemu_opts_from_qdict_entry(QemuOpts *opts,
+ const QDictEntry *entry,
+ Error **errp)
{
- OptsFromQDictState *state = opaque;
+ const char *key = qdict_entry_key(entry);
+ QObject *obj = qdict_entry_value(entry);
char buf[32], *tmp = NULL;
const char *value;
- if (!strcmp(key, "id") || *state->errp) {
+ if (!strcmp(key, "id")) {
return;
}
return;
}
- qemu_opt_set(state->opts, key, value, state->errp);
+ qemu_opt_set(opts, key, value, errp);
g_free(tmp);
}
QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict,
Error **errp)
{
- OptsFromQDictState state;
Error *local_err = NULL;
QemuOpts *opts;
+ const QDictEntry *entry;
opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1,
&local_err);
assert(opts != NULL);
- state.errp = &local_err;
- state.opts = opts;
- qdict_iter(qdict, qemu_opts_from_qdict_1, &state);
- if (local_err) {
- error_propagate(errp, local_err);
- qemu_opts_del(opts);
- return NULL;
+ for (entry = qdict_first(qdict);
+ entry;
+ entry = qdict_next(qdict, entry)) {
+ qemu_opts_from_qdict_entry(opts, entry, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ qemu_opts_del(opts);
+ return NULL;
+ }
}
return opts;
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);
+ qemu_opts_from_qdict_entry(opts, entry, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
- } else {
- qdict_del(qdict, entry->key);
}
+ qdict_del(qdict, entry->key);
}
entry = next;
projects / mirror_qemu.git / blobdiff