From patchwork Tue Jun 18 09:31:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 252200 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 038FF2C00A0 for ; Tue, 18 Jun 2013 19:36:37 +1000 (EST) Received: from localhost ([::1]:32844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UosL3-0002Da-UY for incoming@patchwork.ozlabs.org; Tue, 18 Jun 2013 05:36:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UosI8-00076w-V4 for qemu-devel@nongnu.org; Tue, 18 Jun 2013 05:33:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UosI7-0002AH-DR for qemu-devel@nongnu.org; Tue, 18 Jun 2013 05:33:32 -0400 Received: from mail-ie0-x230.google.com ([2607:f8b0:4001:c03::230]:62483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UosI7-0002AD-74 for qemu-devel@nongnu.org; Tue, 18 Jun 2013 05:33:31 -0400 Received: by mail-ie0-f176.google.com with SMTP id ar20so9402465iec.35 for ; Tue, 18 Jun 2013 02:33:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=UP38jKMvHY933722SEXjZ0t7boRIqW1z4gqh/6QEkg8=; b=bHiBPQWbmuKSeQR5gHSpqm/aKKNFqtos2WusTVzZI3tW3Tq8I8WoO39q6+MER/E1/r ZxXW0oQJQkEfUYfNFDQ9LVLN1UYtiyPaAbrH71Fm7MtsHX6t6sh4nRUdi2KCkF3WV2L6 86hScDXyH9HvPBFul9PkYwRzAh8Xbkk1ecqZC/KYwl5fOZMn/n682/EeQv6r50gd/SRH bRZHqvEyZMby753mhATQ174eFlr+2xBBTmCv5CK2PI5Sv/ZSHfG2emefZD9wkWjpjm11 3iuIsQJKLBoWd5w9VkjYu0c5RJFc4w8KutNZcbtD+vCXbBrra0x98exY8REfZorder0t ByKA== X-Received: by 10.50.56.111 with SMTP id z15mr7019719igp.100.1371548010778; Tue, 18 Jun 2013 02:33:30 -0700 (PDT) Received: from 11.wdongxu.kvm58 ([202.108.130.153]) by mx.google.com with ESMTPSA id bc6sm373016igb.1.2013.06.18.02.33.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 18 Jun 2013 02:33:30 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Tue, 18 Jun 2013 17:31:54 +0800 Message-Id: <1371547919-15654-3-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1371547919-15654-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1371547919-15654-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:4001:c03::230 Cc: kwolf@redhat.com, Dong Xu Wang , wdongxu@cn.ibm.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH V16 2/7] 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 This patch moves 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, we could assert. 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 Reviewed-by: Eric Blake --- v13->v14: 1) change code style. 2) assert errors. util/qemu-option.c | 66 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index 84d8c8b..bd2acdc 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -525,9 +525,31 @@ 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); + const QemuOptDesc *desc; + + if (!opt) { + desc = find_desc_by_name(opts->list->desc, name); + if (desc && desc->def_value_str) { + return desc->def_value_str; + } + } return opt ? opt->str : NULL; } @@ -546,9 +568,17 @@ 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; + Error *local_err = NULL; - 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, &local_err); + assert(!local_err); + } return defval; + } assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL); return opt->value.boolean; } @@ -556,9 +586,17 @@ 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; + Error *local_err = NULL; - 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, &local_err); + assert(!local_err); + } return defval; + } assert(opt->desc && opt->desc->type == QEMU_OPT_NUMBER); return opt->value.uint; } @@ -566,9 +604,17 @@ 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; + Error *local_err = NULL; - 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, &local_err); + assert(!local_err); + } return defval; + } assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE); return opt->value.uint; } @@ -609,20 +655,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) {