[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V17 4/9] qemu-option: create some QemuOpts functons
From: |
Dong Xu Wang |
Subject: |
[Qemu-devel] [PATCH V17 4/9] qemu-option: create some QemuOpts functons |
Date: |
Wed, 17 Jul 2013 17:29:43 +0800 |
These functions will be used in next commit.
qemu_opt_get_(*)_del functions are used to make sure we
have the same behaviors as before: in block layer, after
parsing a parameter value, parameter list will delete it
to avoid parsing it twice.
Signed-off-by: Dong Xu Wang <address@hidden>
---
v16->v17:
1) return "char *" instead of "const char*"
v13->v14:
1) rewrite commit message.
2) use def_value_str in qemu_opt_get_FOO_del() and qemu_opt_get_del().
3) delete redundant qemu_opt_del(opt).
include/qemu/option.h | 11 ++++-
util/qemu-option.c | 130 ++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 125 insertions(+), 16 deletions(-)
diff --git a/include/qemu/option.h b/include/qemu/option.h
index 7473e2b..12fa8b4 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -106,6 +106,7 @@ struct QemuOptsList {
};
const char *qemu_opt_get(QemuOpts *opts, const char *name);
+char *qemu_opt_get_del(QemuOpts *opts, const char *name);
/**
* qemu_opt_has_help_opt:
* @opts: options to search for a help request
@@ -119,13 +120,18 @@ const char *qemu_opt_get(QemuOpts *opts, const char
*name);
*/
bool qemu_opt_has_help_opt(QemuOpts *opts);
bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval);
+bool qemu_opt_get_bool_del(QemuOpts *opts, const char *name, bool defval);
uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t
defval);
uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t defval);
+uint64_t qemu_opt_get_size_del(QemuOpts *opts, const char *name,
+ uint64_t defval);
int qemu_opt_set(QemuOpts *opts, const char *name, const char *value);
+int qemu_opt_replace_set(QemuOpts *opts, const char *name, const char *value);
void qemu_opt_set_err(QemuOpts *opts, const char *name, const char *value,
Error **errp);
int qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val);
int qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val);
+int qemu_opt_replace_set_number(QemuOpts *opts, const char *name, int64_t val);
typedef int (*qemu_opt_loopfunc)(const char *name, const char *value, void
*opaque);
int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,
int abort_on_failure);
@@ -142,7 +148,10 @@ const char *qemu_opts_id(QemuOpts *opts);
void qemu_opts_del(QemuOpts *opts);
void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp);
int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char
*firstname);
-QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, int
permit_abbrev);
+int qemu_opts_do_parse_replace(QemuOpts *opts, const char *params,
+ const char *firstname);
+QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params,
+ int permit_abbrev);
void qemu_opts_set_defaults(QemuOptsList *list, const char *params,
int permit_abbrev);
QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict,
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 3a055a7..41f5b0f 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -523,6 +523,32 @@ const char *qemu_opt_get(QemuOpts *opts, const char *name)
return opt ? opt->str : NULL;
}
+static void qemu_opt_del(QemuOpt *opt)
+{
+ QTAILQ_REMOVE(&opt->opts->head, opt, next);
+ g_free((/* !const */ char*)opt->name);
+ g_free((/* !const */ char*)opt->str);
+ g_free(opt);
+}
+
+char *qemu_opt_get_del(QemuOpts *opts, const char *name)
+{
+ QemuOpt *opt = qemu_opt_find(opts, name);
+ const QemuOptDesc *desc;
+ char *str = NULL;
+
+ if (!opt) {
+ desc = find_desc_by_name(opts->list->desc, name);
+ if (desc && desc->def_value_str) {
+ str = g_strdup(desc->def_value_str);
+ }
+ } else {
+ str = g_strdup(opt->str);
+ qemu_opt_del(opt);
+ }
+ return str;
+}
+
bool qemu_opt_has_help_opt(QemuOpts *opts)
{
QemuOpt *opt;
@@ -553,6 +579,27 @@ bool qemu_opt_get_bool(QemuOpts *opts, const char *name,
bool defval)
return opt->value.boolean;
}
+bool qemu_opt_get_bool_del(QemuOpts *opts, const char *name, bool defval)
+{
+ QemuOpt *opt = qemu_opt_find(opts, name);
+ const QemuOptDesc *desc;
+ Error *local_err = NULL;
+ bool ret = defval;
+
+ if (opt == NULL) {
+ desc = find_desc_by_name(opts->list->desc, name);
+ if (desc && desc->def_value_str) {
+ parse_option_bool(name, desc->def_value_str, &ret, &local_err);
+ assert(!local_err);
+ }
+ return ret;
+ }
+ assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL);
+ ret = opt->value.boolean;
+ qemu_opt_del(opt);
+ return ret;
+}
+
uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval)
{
QemuOpt *opt = qemu_opt_find(opts, name);
@@ -589,6 +636,28 @@ uint64_t qemu_opt_get_size(QemuOpts *opts, const char
*name, uint64_t defval)
return opt->value.uint;
}
+uint64_t qemu_opt_get_size_del(QemuOpts *opts, const char *name,
+ uint64_t defval)
+{
+ QemuOpt *opt = qemu_opt_find(opts, name);
+ const QemuOptDesc *desc;
+ Error *local_err = NULL;
+ uint64_t ret = defval;
+
+ if (opt == NULL) {
+ desc = find_desc_by_name(opts->list->desc, name);
+ if (desc && desc->def_value_str) {
+ parse_option_size(name, desc->def_value_str, &ret, &local_err);
+ assert(!local_err);
+ }
+ return ret;
+ }
+ assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE);
+ ret = opt->value.uint;
+ qemu_opt_del(opt);
+ return ret;
+}
+
static void qemu_opt_parse(QemuOpt *opt, Error **errp)
{
if (opt->desc == NULL)
@@ -612,21 +681,13 @@ static void qemu_opt_parse(QemuOpt *opt, Error **errp)
}
}
-static void qemu_opt_del(QemuOpt *opt)
-{
- QTAILQ_REMOVE(&opt->opts->head, opt, next);
- g_free((/* !const */ char*)opt->name);
- g_free((/* !const */ char*)opt->str);
- g_free(opt);
-}
-
static bool opts_accepts_any(const QemuOpts *opts)
{
return opts->list->desc[0].name == NULL;
}
static void opt_set(QemuOpts *opts, const char *name, const char *value,
- bool prepend, Error **errp)
+ bool prepend, bool replace, Error **errp)
{
QemuOpt *opt;
const QemuOptDesc *desc;
@@ -638,6 +699,11 @@ static void opt_set(QemuOpts *opts, const char *name,
const char *value,
return;
}
+ opt = qemu_opt_find(opts, name);
+ if (replace && opt) {
+ qemu_opt_del(opt);
+ }
+
opt = g_malloc0(sizeof(*opt));
opt->name = g_strdup(name);
opt->opts = opts;
@@ -659,7 +725,25 @@ int qemu_opt_set(QemuOpts *opts, const char *name, const
char *value)
{
Error *local_err = NULL;
- opt_set(opts, name, value, false, &local_err);
+ opt_set(opts, name, value, false, false, &local_err);
+ if (error_is_set(&local_err)) {
+ qerror_report_err(local_err);
+ error_free(local_err);
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
+ * If name exists, the function will delete the opt first and then add a new
+ * one.
+ */
+int qemu_opt_replace_set(QemuOpts *opts, const char *name, const char *value)
+{
+ Error *local_err = NULL;
+
+ opt_set(opts, name, value, false, true, &local_err);
if (error_is_set(&local_err)) {
qerror_report_err(local_err);
error_free(local_err);
@@ -672,7 +756,7 @@ int qemu_opt_set(QemuOpts *opts, const char *name, const
char *value)
void qemu_opt_set_err(QemuOpts *opts, const char *name, const char *value,
Error **errp)
{
- opt_set(opts, name, value, false, errp);
+ opt_set(opts, name, value, false, false, errp);
}
int qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val)
@@ -719,6 +803,16 @@ int qemu_opt_set_number(QemuOpts *opts, const char *name,
int64_t val)
return 0;
}
+int qemu_opt_replace_set_number(QemuOpts *opts, const char *name, int64_t val)
+{
+ QemuOpt *opt = qemu_opt_find(opts, name);
+
+ if (opt) {
+ qemu_opt_del(opt);
+ }
+ return qemu_opt_set_number(opts, name, val);
+}
+
int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,
int abort_on_failure)
{
@@ -892,7 +986,7 @@ int qemu_opts_print(QemuOpts *opts)
}
static int opts_do_parse(QemuOpts *opts, const char *params,
- const char *firstname, bool prepend)
+ const char *firstname, bool prepend, bool replace)
{
char option[128], value[1024];
const char *p,*pe,*pc;
@@ -928,7 +1022,7 @@ static int opts_do_parse(QemuOpts *opts, const char
*params,
}
if (strcmp(option, "id") != 0) {
/* store and parse */
- opt_set(opts, option, value, prepend, &local_err);
+ opt_set(opts, option, value, prepend, replace, &local_err);
if (error_is_set(&local_err)) {
qerror_report_err(local_err);
error_free(local_err);
@@ -944,7 +1038,13 @@ static int opts_do_parse(QemuOpts *opts, const char
*params,
int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char
*firstname)
{
- return opts_do_parse(opts, params, firstname, false);
+ return opts_do_parse(opts, params, firstname, false, false);
+}
+
+int qemu_opts_do_parse_replace(QemuOpts *opts, const char *params,
+ const char *firstname)
+{
+ return opts_do_parse(opts, params, firstname, false, true);
}
static QemuOpts *opts_parse(QemuOptsList *list, const char *params,
@@ -975,7 +1075,7 @@ static QemuOpts *opts_parse(QemuOptsList *list, const char
*params,
return NULL;
}
- if (opts_do_parse(opts, params, firstname, defaults) != 0) {
+ if (opts_do_parse(opts, params, firstname, defaults, false) != 0) {
qemu_opts_del(opts);
return NULL;
}
--
1.7.11.7
- [Qemu-devel] [PATCH V17 0/9] replace QEMUOptionParameter with QemuOpts parser, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 1/9] qemu-option: add def_value_str in QemuOptDesc struct and rewrite qemu_opts_print, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 3/9] qemu-option: create four QemuOptsList related functions, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 9/9] qemu-option: use qemu_opts_del without judging NULL, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 4/9] qemu-option: create some QemuOpts functons,
Dong Xu Wang <=
- [Qemu-devel] [PATCH V17 7/9] qemu-option: remove QEMUOptionParameter related functions and struct, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 8/9] qemu-option: make qemu_opts_del accept opts being NULL, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 5/9] block: use QemuOpts support in block layer, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 2/9] qemu-option: avoid duplication of default value in QemuOpts, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 6/9] qapi: query-command-line-options outputs def_value_str, Dong Xu Wang, 2013/07/17
- Re: [Qemu-devel] [PATCH V17 0/9] replace QEMUOptionParameter with QemuOpts parser, Eric Blake, 2013/07/17