[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v28 02/33] QemuOpts: repurpose qemu_opts_print to re
From: |
Chunyan Liu |
Subject: |
[Qemu-devel] [PATCH v28 02/33] QemuOpts: repurpose qemu_opts_print to replace print_option_parameters |
Date: |
Thu, 5 Jun 2014 17:20:41 +0800 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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 : "<noid>");
+ printf("%s: %s:", opts->list->name,
+ opts->id ? opts->id : "<noid>");
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.7.12.4
- [Qemu-devel] [PATCH v28 00/33] replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 06/33] QemuOpts: move qemu_opt_del ahead for later calling, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 05/33] QemuOpts: change opt->name|str from (const char *) to (char *), Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 01/33] QemuOpts: move find_desc_by_name ahead for later calling, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 03/33] QemuOpts: add def_value_str to QemuOptDesc, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 08/33] QemuOpts: add qemu_opts_print_help to replace print_option_help, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 04/33] qapi: output def_value_str when query command line options, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 02/33] QemuOpts: repurpose qemu_opts_print to replace print_option_parameters,
Chunyan Liu <=
- [Qemu-devel] [PATCH v28 07/33] QemuOpts: add qemu_opt_get_*_del functions for replace work, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 09/33] QemuOpts: add conversion between QEMUOptionParameter to QemuOpts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 10/33] QemuOpts: add qemu_opts_append to replace append_option_parameters, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 11/33] QemuOpts: check NULL input for qemu_opts_del, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 15/33] gluster.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 17/33] nfs.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 12/33] change block layer to support both QemuOpts and QEMUOptionParamter, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 14/33] cow.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 13/33] vvfat.c: handle cross_driver's create_options and create_opts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 16/33] iscsi.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/06/05