From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwV2P-0002hE-So for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:25:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwV2K-0001eJ-Qf for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:25:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwV2K-0001e5-Gf for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:25:16 -0400 From: Stefan Hajnoczi Date: Mon, 16 Jun 2014 19:23:32 +0800 Message-Id: <1402917843-6459-9-git-send-email-stefanha@redhat.com> In-Reply-To: <1402917843-6459-1-git-send-email-stefanha@redhat.com> References: <1402917843-6459-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 08/39] QemuOpts: repurpose qemu_opts_print to replace print_option_parameters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Chunyan Liu , Stefan Hajnoczi From: Chunyan Liu Currently this function is not used anywhere. In later patches, it will replace print_option_parameters. To avoid print info changes, change qemu_opts_print from fprintf stderr to printf, and remove last printf. Signed-off-by: Chunyan Liu Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi --- include/qemu/option.h | 2 +- util/qemu-option.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/qemu/option.h b/include/qemu/option.h index 8c0ac34..1077b69 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -156,7 +156,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 c188c5c..2c46791 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -895,17 +895,15 @@ 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; - fprintf(stderr, "%s: %s:", opts->list->name, - opts->id ? opts->id : ""); + printf("%s: %s:", opts->list->name, + opts->id ? opts->id : ""); QTAILQ_FOREACH(opt, &opts->head, next) { - fprintf(stderr, " %s=\"%s\"", opt->name, opt->str); + printf(" %s=\"%s\"", opt->name, opt->str); } - fprintf(stderr, "\n"); - return 0; } static int opts_do_parse(QemuOpts *opts, const char *params, -- 1.9.3