From patchwork Wed May 8 08:45:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 242521 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 8B31C2C0119 for ; Wed, 8 May 2013 18:47:48 +1000 (EST) Received: from localhost ([::1]:40296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ua02L-0002QT-4r for incoming@patchwork.ozlabs.org; Wed, 08 May 2013 04:47:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ua00v-00012r-0H for qemu-devel@nongnu.org; Wed, 08 May 2013 04:46:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ua00r-000449-Eb for qemu-devel@nongnu.org; Wed, 08 May 2013 04:46:16 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:47249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ua00r-00043w-5f for qemu-devel@nongnu.org; Wed, 08 May 2013 04:46:13 -0400 Received: by mail-pa0-f44.google.com with SMTP id jh10so1176434pab.17 for ; Wed, 08 May 2013 01:46:12 -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=lE3XTgkFuTikH6NWeZiCM03kYKVRxpwM5tTXS9P3K74=; b=jW5XlmTxs2jrbhyDm2QHzzRFcGbrwukGfvPSQcJUinKpWq4k9mNN7VxBWCTSueoRrY 7+nHBls7iknxcM2ElDeT5eEgNqjSX00BXe/lJUCWdzMFnj0BdusZvVGmM/sb8OqfHkio dV/HAef31vqzInMwa1AUhzGwFE+YnOOESVQHv+jQw7tImNqxmfd+OesX76AoS4gDoNyU lbS+xoYKHHhbOA8jD1krtGG2YBUAXTo9lzjI/1iPH9F0j1cVTybtyO2qgCOXicS0BtcC vJxNxkNdEQIP+M2X7EXNIva7KkJWIF+WCo3amYEZ8xN9r2y2/Xuo4KOABlr+aa2M4twZ lWuQ== X-Received: by 10.66.121.169 with SMTP id ll9mr6899020pab.126.1368002772260; Wed, 08 May 2013 01:46:12 -0700 (PDT) Received: from localhost.localdomain ([202.108.130.138]) by mx.google.com with ESMTPSA id wi6sm31760893pbc.22.2013.05.08.01.46.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 01:46:11 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Wed, 8 May 2013 16:45:30 +0800 Message-Id: <1368002735-3646-2-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368002735-3646-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1368002735-3646-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.44 Cc: Dong Xu Wang , kwol@redhat.com, wdongxu@cn.ibm.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH V14 1/6] add def_value_str in QemuOptDesc struct and rewrite qemu_opts_print 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 qemu_opts_print has no user now, so can re-write the function safely. qemu_opts_print will be used while using "qemu-img create", it will produce the same output as previous code. The behavior of this function has changed: 1. Print every possible option, whether a value has been set or not. 2. Option descriptors may provide a default value. 3. Print to stdout instead of stderr. Previously the behavior was to print every option that has been set. Options that have not been set would be skipped. Signed-off-by: Dong Xu Wang --- v13->v14: 1) fix memory leak. 2) make opt_set do not accpet null value argument. v12->v13 1) re-write commit message. v11->v12 1) make def_value_str become the real default value string in opt_set function. v10->v11: 1) print all values that have actually been assigned while accept-any cases. v7->v8: 1) print "elements => accept any params" while opts_accepts_any() == true. 2) since def_print_str is the default value if an option isn't set, so rename it to def_value_str. include/qemu/option.h | 3 ++- util/qemu-option.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/include/qemu/option.h b/include/qemu/option.h index bdb6d21..b928ab0 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -96,6 +96,7 @@ typedef struct QemuOptDesc { const char *name; enum QemuOptType type; const char *help; + const char *def_value_str; } QemuOptDesc; struct QemuOptsList { @@ -152,7 +153,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); +int 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 8b74bf1..84d8c8b 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -860,16 +860,36 @@ void qemu_opts_del(QemuOpts *opts) g_free(opts); } -int qemu_opts_print(QemuOpts *opts, void *dummy) +int 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) { + printf("%s=\"%s\" ", opt->name, opt->str); + } + return 0; + } + for (; desc && desc->name; desc++) { + const char *value = desc->def_value_str; + QemuOpt *opt; + + opt = qemu_opt_find(opts, desc->name); + if (opt) { + value = opt->str; + } + + if (!value) { + continue; + } + + if (desc->type == QEMU_OPT_STRING) { + printf("%s='%s' ", desc->name, value); + } else { + printf("%s=%s ", desc->name, value); + } } - fprintf(stderr, "\n"); return 0; }