From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDTNe-0001nr-9v for qemu-devel@nongnu.org; Wed, 12 Feb 2014 01:33:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDTNW-0000qE-24 for qemu-devel@nongnu.org; Wed, 12 Feb 2014 01:33:10 -0500 Received: from victor.provo.novell.com ([137.65.250.26]:49744) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDTNV-0000pa-Nj for qemu-devel@nongnu.org; Wed, 12 Feb 2014 01:33:02 -0500 From: Chunyan Liu Date: Wed, 12 Feb 2014 14:33:03 +0800 Message-Id: <1392186806-10418-4-git-send-email-cyliu@suse.com> In-Reply-To: <1392186806-10418-1-git-send-email-cyliu@suse.com> References: <1392186806-10418-1-git-send-email-cyliu@suse.com> Subject: [Qemu-devel] [PATCH v20 03/26] improve some functions in qemu-option.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Dong Xu Wang , Chunyan Liu , stefanha@redhat.com Improve opt_get and opt_set group of functions. For opt_get, check and handle NUlL input; for opt_set, when set to an existing option, rewrite the option with new value. Signed-off-by: Dong Xu Wang Signed-off-by: Chunyan Liu --- util/qemu-option.c | 84 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 70 insertions(+), 14 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index fd84f95..ea6793a 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -499,6 +499,9 @@ static QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name) { QemuOpt *opt; + if (!opts) + return NULL; + QTAILQ_FOREACH_REVERSE(opt, &opts->head, QemuOptHead, next) { if (strcmp(opt->name, name) != 0) continue; @@ -509,9 +512,14 @@ static QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name) const char *qemu_opt_get(QemuOpts *opts, const char *name) { - QemuOpt *opt = qemu_opt_find(opts, name); + QemuOpt *opt; const QemuOptDesc *desc; + if (!opts) { + 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) { @@ -535,10 +543,16 @@ bool qemu_opt_has_help_opt(QemuOpts *opts) bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval) { - QemuOpt *opt = qemu_opt_find(opts, name); + QemuOpt *opt; const QemuOptDesc *desc; Error *local_err = NULL; + if (!opts) { + return defval; + } + + opt = qemu_opt_find(opts, name); + if (opt == NULL) { desc = find_desc_by_name(opts->list->desc, name); if (desc && desc->def_value_str) { @@ -553,10 +567,16 @@ bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval) uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval) { - QemuOpt *opt = qemu_opt_find(opts, name); + QemuOpt *opt; const QemuOptDesc *desc; Error *local_err = NULL; + if (!opts) { + return defval; + } + + opt = qemu_opt_find(opts, name); + if (opt == NULL) { desc = find_desc_by_name(opts->list->desc, name); if (desc && desc->def_value_str) { @@ -571,10 +591,15 @@ 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) { - QemuOpt *opt = qemu_opt_find(opts, name); + QemuOpt *opt; const QemuOptDesc *desc; Error *local_err = NULL; + if (!opts) { + return defval; + } + + opt = qemu_opt_find(opts, name); if (opt == NULL) { desc = find_desc_by_name(opts->list->desc, name); if (desc && desc->def_value_str) { @@ -612,6 +637,10 @@ static void qemu_opt_parse(QemuOpt *opt, Error **errp) static void qemu_opt_del(QemuOpt *opt) { + if (!opt) { + return; + } + QTAILQ_REMOVE(&opt->opts->head, opt, next); g_free((/* !const */ char*)opt->name); g_free((/* !const */ char*)opt->str); @@ -664,6 +693,13 @@ static void opt_set(QemuOpts *opts, const char *name, const char *value, return; } + opt = qemu_opt_find(opts, name); + if (opt) { + g_free((char *)opt->str); + opt->str = g_strdup(value); + return; + } + opt = g_malloc0(sizeof(*opt)); opt->name = g_strdup(name); opt->opts = opts; @@ -704,16 +740,24 @@ void qemu_opt_set_err(QemuOpts *opts, const char *name, const char *value, int qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val) { QemuOpt *opt; - const QemuOptDesc *desc = opts->list->desc; + const QemuOptDesc *desc; - opt = g_malloc0(sizeof(*opt)); - opt->desc = find_desc_by_name(desc, name); - if (!opt->desc && !opts_accepts_any(opts)) { + desc = find_desc_by_name(opts->list->desc, name); + if (!desc && !opts_accepts_any(opts)) { qerror_report(QERR_INVALID_PARAMETER, name); - g_free(opt); return -1; } + opt = qemu_opt_find(opts, name); + if (opt) { + g_free((char *)opt->str); + opt->value.boolean = val; + opt->str = g_strdup(val ? "on" : "off"); + return 0; + } + + opt = g_malloc0(sizeof(*opt)); + opt->desc = desc; opt->name = g_strdup(name); opt->opts = opts; opt->value.boolean = !!val; @@ -726,16 +770,24 @@ 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) { QemuOpt *opt; - const QemuOptDesc *desc = opts->list->desc; + const QemuOptDesc *desc; - opt = g_malloc0(sizeof(*opt)); - opt->desc = find_desc_by_name(desc, name); - if (!opt->desc && !opts_accepts_any(opts)) { + desc = find_desc_by_name(opts->list->desc, name); + if (!desc && !opts_accepts_any(opts)) { qerror_report(QERR_INVALID_PARAMETER, name); - g_free(opt); return -1; } + opt = qemu_opt_find(opts, name); + if (opt) { + g_free((char *)opt->str); + opt->value.uint = val; + opt->str = g_strdup_printf("%" PRId64, val); + return 0; + } + + opt = g_malloc0(sizeof(*opt)); + opt->desc = desc; opt->name = g_strdup(name); opt->opts = opts; opt->value.uint = val; @@ -870,6 +922,10 @@ void qemu_opts_del(QemuOpts *opts) { QemuOpt *opt; + if (!opts) { + return; + } + for (;;) { opt = QTAILQ_FIRST(&opts->head); if (opt == NULL) -- 1.6.0.2