From patchwork Wed Apr 10 06:25:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 235301 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 67BAA2C00C0 for ; Wed, 10 Apr 2013 16:26:29 +1000 (EST) Received: from localhost ([::1]:48991 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPoUF-0004gi-H4 for incoming@patchwork.ozlabs.org; Wed, 10 Apr 2013 02:26:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPoTj-0004ew-SD for qemu-devel@nongnu.org; Wed, 10 Apr 2013 02:25:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPoTi-0008OQ-CV for qemu-devel@nongnu.org; Wed, 10 Apr 2013 02:25:55 -0400 Received: from mail-da0-x235.google.com ([2607:f8b0:400e:c00::235]:55427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPoTh-0008NY-VS for qemu-devel@nongnu.org; Wed, 10 Apr 2013 02:25:54 -0400 Received: by mail-da0-f53.google.com with SMTP id n34so69947dal.26 for ; Tue, 09 Apr 2013 23:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=C6nyx4i1e9kj0G4Mr5OmByMPH0LzHB6xEk2B0XmeMDM=; b=DSiBMMw2FytdNs9PripAB3cPr7+biKHX7vZbLHOZrTfFqdDZCWUBHq4li1jp1tu2NT AxM9tOT177QVTIee+LriOHXFNcyvaiAlmLNxC9iko7iEloCRNG+6nEAnwuiJm3EglH4k ZvoLco0+NV3Vf8Rrlb3Klqix7QUTlWnDDF6paYUykNUp8aQ5zKdfjARDAOZesEFIEkzY zGMVwD1lxJHlXmn049+w01haSEWAL7gboKGsrBf5+iGufiIbjvh8bQe9GwU7MaQGhG+p 0lNE02giuLhzzoO/AXs4aETd26NxoZO5be8FJq1N8sX+JhO0D+yEYjJBOZ4CcsfnmSWA YaOA== X-Received: by 10.66.253.232 with SMTP id ad8mr1720456pad.119.1365575153263; Tue, 09 Apr 2013 23:25:53 -0700 (PDT) Received: from localhost.localdomain ([202.108.130.138]) by mx.google.com with ESMTPS id fq1sm5192926pbb.33.2013.04.09.23.25.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Apr 2013 23:25:52 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Wed, 10 Apr 2013 14:25:07 +0800 Message-Id: <1365575111-4476-3-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1365575111-4476-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1365575111-4476-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c00::235 Cc: kwolf@redhat.com, Dong Xu Wang , wdongxu@cn.ibm.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH V13 2/6] avoid duplication of default value in QemuOpts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org According Markus's comments, his patch will move the default value entirely to QemuOptDesc. When getting the value of an option that hasn't been set, and QemuOptDesc has a default value, return that. Else, behave as before. Example: qemu_opt_get_number(opts, "foo", 42) If "foo" has been set in opts, return its value. Else, if opt's QemuOptDesc has a default value for "foo", return that. Else, return 42. Note that the last argument is useless when QemuOptDesc has a default value. Ugly. If it bothers us, assert that the argument equals the default from QemuOptDesc. Example: qemu_opt_get(opts, "bar") If "bar" has been set in opts, return its value. Else, if opt's QemuOptDesc has a default value for "bar", return that. Else, return NULL. Signed-off-by: Dong Xu Wang --- util/qemu-option.c | 58 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index 57cdd57..4f94000 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -525,10 +525,28 @@ static QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name) return NULL; } +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; +} + const char *qemu_opt_get(QemuOpts *opts, const char *name) { QemuOpt *opt = qemu_opt_find(opts, name); - return opt ? opt->str : NULL; + const QemuOptDesc *desc; + desc = find_desc_by_name(opts->list->desc, name); + + return opt ? opt->str : + (desc && desc->def_value_str ? desc->def_value_str : NULL); } bool qemu_opt_has_help_opt(QemuOpts *opts) @@ -546,9 +564,15 @@ 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); + const QemuOptDesc *desc; - if (opt == NULL) + 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, &defval, NULL); + } return defval; + } assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL); return opt->value.boolean; } @@ -556,9 +580,15 @@ 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); + const QemuOptDesc *desc; - if (opt == NULL) + if (opt == NULL) { + desc = find_desc_by_name(opts->list->desc, name); + if (desc && desc->def_value_str) { + parse_option_number(name, desc->def_value_str, &defval, NULL); + } return defval; + } assert(opt->desc && opt->desc->type == QEMU_OPT_NUMBER); return opt->value.uint; } @@ -566,9 +596,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); + const QemuOptDesc *desc; - if (opt == NULL) + 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, &defval, NULL); + } return defval; + } assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE); return opt->value.uint; } @@ -609,20 +645,6 @@ static bool opts_accepts_any(const QemuOpts *opts) return opts->list->desc[0].name == NULL; } -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; -} - static void opt_set(QemuOpts *opts, const char *name, const char *value, bool prepend, Error **errp) {