From patchwork Fri Mar 21 00:13:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leandro Dorileo X-Patchwork-Id: 332440 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 578F02C0040 for ; Fri, 21 Mar 2014 11:14:48 +1100 (EST) Received: from localhost ([::1]:50094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQn6k-0000bL-0G for incoming@patchwork.ozlabs.org; Thu, 20 Mar 2014 20:14:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQn5x-0000Pa-TN for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:14:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQn5q-0007Tw-Jc for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:13:57 -0400 Received: from mail-yk0-f174.google.com ([209.85.160.174]:50024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQn5q-0007Tr-EI for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:13:50 -0400 Received: by mail-yk0-f174.google.com with SMTP id 20so4367326yks.5 for ; Thu, 20 Mar 2014 17:13:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PRTGWQQNVwjOWbmT5fYHOx2fpr++ySGKI60zaDQsapk=; b=Yk/iIbU1vsrYTY9BIT4YF1+zDEOeHtYlJ2EuwWa3D2ACFmQNL9J9y633msyYYJRX/X fuTNagpmvchOXYu9U/HUNKcyi2tX5thpgKh7vgpPSqCa5dtbdrBOv0X27MQ8sQK5PwF8 ErNAS2GIvYACXrmrSrCjATzceL4ZMxvGviApuMyzRd6/BtVLa3vx/GJF7WLyU9SehEBl u9n7I4jofxNJ/M6twzDZ8tteL/+tVoIY7R2yjL4Xj1qT7S3KJWdiy4CR+NBFD11zfda7 Dts03oLZsTKfvwy7SplltVmYH3QHSm7GZeXS2oGNcsxPGl0/eTc/WjPE3G2wiINJCYnJ jLPw== X-Gm-Message-State: ALoCoQlIYqaGW7sczGxEoGz0SJLq6uKBf+6r3b0IuCk2V6JKiRU4M+jhA0Dvr2It4dSyjs+z5GZa X-Received: by 10.236.134.71 with SMTP id r47mr23651281yhi.83.1395360828330; Thu, 20 Mar 2014 17:13:48 -0700 (PDT) Received: from dorilex-lnv.MultilaserAP ([177.194.92.107]) by mx.google.com with ESMTPSA id k63sm5501231yhg.37.2014.03.20.17.13.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Mar 2014 17:13:47 -0700 (PDT) From: Leandro Dorileo To: qemu-devel@nongnu.org Date: Thu, 20 Mar 2014 21:13:09 -0300 Message-Id: <1395360813-2833-3-git-send-email-l@dorileo.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1395360813-2833-1-git-send-email-l@dorileo.org> References: <1395360813-2833-1-git-send-email-l@dorileo.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.174 Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Liu Yuan , Jeff Cody , Markus Armbruster , Peter Lieven , "Richard W.M. Jones" , Dong Xu Wang , Luiz Capitulino , Chunyan Liu , Leandro Dorileo , Ronnie Sahlberg , Josh Durgin , Anthony Liguori , Paolo Bonzini , Stefan Weil , Max Reitz , MORITA Kazutaka , Benoit Canet Subject: [Qemu-devel] [PATCH 02/26] add def_value_str to QemuOptDesc 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 From: Chunyan Liu Add def_value_str (default value) to QemuOptDesc, to replace function of the default value in QEMUOptionParameter. And improved related functions. Signed-off-by: Dong Xu Wang Signed-off-by: Chunyan Liu --- include/qemu/option.h | 3 +- util/qemu-option.c | 84 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 24 deletions(-) diff --git a/include/qemu/option.h b/include/qemu/option.h index 8c0ac34..c3b0a91 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -99,6 +99,7 @@ typedef struct QemuOptDesc { const char *name; enum QemuOptType type; const char *help; + const char *def_value_str; } QemuOptDesc; struct QemuOptsList { @@ -156,7 +157,7 @@ QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict); void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp); typedef int (*qemu_opts_loopfunc)(QemuOpts *opts, void *opaque); -int qemu_opts_print(QemuOpts *opts, void *dummy); +void qemu_opts_print(QemuOpts *opts); int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque, int abort_on_failure); diff --git a/util/qemu-option.c b/util/qemu-option.c index 9d898af..8c0756d 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -33,6 +33,20 @@ #include "qapi/qmp/qerror.h" #include "qemu/option_int.h" +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; +} + /* * Extracts the name of an option from the parameter string (p points at the * first byte of the option name) @@ -556,6 +570,13 @@ 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); + + if (!opt) { + const QemuOptDesc *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; } @@ -575,8 +596,13 @@ bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval) { QemuOpt *opt = qemu_opt_find(opts, name); - if (opt == NULL) + if (opt == NULL) { + const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name); + if (desc && desc->def_value_str) { + parse_option_bool(name, desc->def_value_str, &defval, &error_abort); + } return defval; + } assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL); return opt->value.boolean; } @@ -585,8 +611,14 @@ uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval) { QemuOpt *opt = qemu_opt_find(opts, name); - if (opt == NULL) + if (opt == NULL) { + const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name); + if (desc && desc->def_value_str) { + parse_option_number(name, desc->def_value_str, &defval, + &error_abort); + } return defval; + } assert(opt->desc && opt->desc->type == QEMU_OPT_NUMBER); return opt->value.uint; } @@ -595,8 +627,13 @@ uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t defval) { QemuOpt *opt = qemu_opt_find(opts, name); - if (opt == NULL) + if (opt == NULL) { + const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name); + if (desc && desc->def_value_str) { + parse_option_size(name, desc->def_value_str, &defval, &error_abort); + } return defval; + } assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE); return opt->value.uint; } @@ -637,20 +674,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; -} - int qemu_opt_unset(QemuOpts *opts, const char *name) { QemuOpt *opt = qemu_opt_find(opts, name); @@ -895,17 +918,32 @@ void qemu_opts_del(QemuOpts *opts) g_free(opts); } -int qemu_opts_print(QemuOpts *opts, void *dummy) +void qemu_opts_print(QemuOpts *opts) { QemuOpt *opt; + QemuOptDesc *desc = opts->list->desc; - fprintf(stderr, "%s: %s:", opts->list->name, - opts->id ? opts->id : ""); - QTAILQ_FOREACH(opt, &opts->head, next) { - fprintf(stderr, " %s=\"%s\"", opt->name, opt->str); + if (desc[0].name == NULL) { + QTAILQ_FOREACH(opt, &opts->head, next) { + fprintf(stderr, "%s=\"%s\" ", opt->name, opt->str); + } + return; + } + for (; desc && desc->name; desc++) { + const char *value; + QemuOpt *opt = qemu_opt_find(opts, desc->name); + + value = opt ? opt->str : desc->def_value_str; + if (!value) { + continue; + } + if (desc->type == QEMU_OPT_STRING) { + fprintf(stderr, "%s='%s' ", desc->name, value); + } else { + fprintf(stderr, "%s=%s ", desc->name, value); + } } fprintf(stderr, "\n"); - return 0; } static int opts_do_parse(QemuOpts *opts, const char *params,