From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRN10-0007HQ-Gx for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:58:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRN0u-0005Pt-Hw for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:58:26 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:64306) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRN0u-0005MJ-Ch for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:58:20 -0400 Received: by mail-ob0-f173.google.com with SMTP id wc18so1460065obb.4 for ; Thu, 25 Oct 2012 05:58:20 -0700 (PDT) Sender: Dong Xu Wang From: Dong Xu Wang Date: Thu, 25 Oct 2012 20:57:25 +0800 Message-Id: <1351169848-28223-8-git-send-email-wdongxu@linux.vnet.ibm.com> In-Reply-To: <1351169848-28223-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1351169848-28223-1-git-send-email-wdongxu@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V4 07/10] add def_value and use it in qemu_opts_print. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Dong Xu Wang qemu_opts_print has no user now, so I re-write it and use it in qemu-img.c. qemu_opts_print will be used while using "qemu-img create", it will produce the same output as previous code. Signed-off-by: Dong Xu Wang --- qemu-option.c | 41 ++++++++++++++++++++++++++++++++--------- qemu-option.h | 1 + 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index eeb2c9c..54dbdd0 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -860,15 +860,38 @@ void qemu_opts_del(QemuOpts *opts) int qemu_opts_print(QemuOpts *opts, void *dummy) { - QemuOpt *opt; - - 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); - } - fprintf(stderr, "\n"); - return 0; + QemuOpt *opt = NULL; + QemuOptDesc *desc = opts->list->desc; + + while (desc && desc->name) { + opt = qemu_opt_find(opts, desc->name); + switch (desc->type) { + case QEMU_OPT_STRING: + if (opt != NULL) { + printf("%s='%s' ", opt->name, opt->str); + } + break; + case QEMU_OPT_BOOL: + printf("%s=%s ", desc->name, (opt && opt->str) ? "on" : "off"); + break; + case QEMU_OPT_NUMBER: + case QEMU_OPT_SIZE: + if (strcmp(desc->name, "cluster_size")) { + printf("%s=%" PRId64 " ", desc->name, + (opt && opt->value.uint) ? opt->value.uint : 0); + } else { + printf("%s=%" PRId64 " ", desc->name, + (opt && opt->value.uint) ? + opt->value.uint : desc->def_value); + } + break; + default: + printf("%s=(unknown type) ", desc->name); + break; + } + desc++; + } + return 0; } static int opts_do_parse(QemuOpts *opts, const char *params, diff --git a/qemu-option.h b/qemu-option.h index 002dd07..9ea59cf 100644 --- a/qemu-option.h +++ b/qemu-option.h @@ -96,6 +96,7 @@ typedef struct QemuOptDesc { const char *name; enum QemuOptType type; const char *help; + uint64_t def_value; } QemuOptDesc; struct QemuOptsList { -- 1.7.1