From patchwork Mon Dec 17 06:42:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 206788 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 E07472C008E for ; Mon, 17 Dec 2012 17:50:38 +1100 (EST) Received: from localhost ([::1]:34804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkUX7-0006LA-4a for incoming@patchwork.ozlabs.org; Mon, 17 Dec 2012 01:50:37 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkUT7-0002qG-0C for qemu-devel@nongnu.org; Mon, 17 Dec 2012 01:50:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkUPe-0002Ux-4J for qemu-devel@nongnu.org; Mon, 17 Dec 2012 01:46:28 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:61678) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkUPd-0002Ut-Vb for qemu-devel@nongnu.org; Mon, 17 Dec 2012 01:42:54 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so8782688iej.4 for ; Sun, 16 Dec 2012 22:42:53 -0800 (PST) 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=/l9eyChNBmPTECZHJe4iplgA/IXUrwUiEMLHuj4yreQ=; b=kk2WiszGjj66WGYtZZqW0rD5tUq3nN8+xPuQ8cGD+n35+Nk1qWy7PyhcbasaQjz3p/ aC7oC+Ck9le73seXCV2Nyp02Po5bQxgkbx/a3rUcAkR+u9eUkFQKMQCacX1CZEG8Ugc1 uBU+X8DafFzlnZnrq33+NIpZho9AygkefQ4Fy5X7U1prYUFcJD5NlqVizdC+QB5836fK V3cY/Vd8jKh672dQoi2c1NP6qGN6Ndcx+IagmBJlERx+lg/or/qxqkyJYDgy+kNFdT0v 75b8UbWLex/YrL4KLYICeiXyqFop0z9oZZHrZu+EJ/vXNIRlEbyq7LMw38KpJwgv7ELx w16Q== Received: by 10.50.152.196 with SMTP id va4mr8327780igb.13.1355726573489; Sun, 16 Dec 2012 22:42:53 -0800 (PST) Received: from localhost.localdomain ([202.108.130.194]) by mx.google.com with ESMTPS id pr7sm5079542igc.16.2012.12.16.22.42.50 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 16 Dec 2012 22:42:52 -0800 (PST) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Mon, 17 Dec 2012 14:42:26 +0800 Message-Id: <1355726549-5980-2-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1355726549-5980-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1355726549-5980-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.173 Cc: kwolf@redhat.com, Dong Xu Wang Subject: [Qemu-devel] [PATCH V9 1/4] add def_print_str and use it in 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. 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. Signed-off-by: Dong Xu Wang --- qemu-option.c | 31 ++++++++++++++++++++++++------- qemu-option.h | 1 + 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index 94557cf..139ecd6 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -862,15 +862,32 @@ void qemu_opts_del(QemuOpts *opts) int qemu_opts_print(QemuOpts *opts, void *dummy) { - 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) { + printf("no elements => accept any params"); + return 0; } - fprintf(stderr, "\n"); - 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); + } + } + return 0; } static int opts_do_parse(QemuOpts *opts, const char *params, diff --git a/qemu-option.h b/qemu-option.h index 002dd07..2f8b9f0 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; + const char *def_value_str; } QemuOptDesc; struct QemuOptsList {