diff options
| author | Chunyan Liu <cyliu@suse.com> | 2014-06-05 17:20:41 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-06-16 17:23:19 +0800 |
| commit | e67905426bf3cf811d31c87789c1c7e986849d66 (patch) | |
| tree | 556b38c40ad3663e06f0652e81f53fdca4fe9d7c | |
| parent | 5e89db7641fdf61f066119e4d8864ad7be1e32f0 (diff) | |
| download | qemu-e67905426bf3cf811d31c87789c1c7e986849d66.tar.gz | |
QemuOpts: repurpose qemu_opts_print to replace print_option_parameters
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 <cyliu@suse.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | include/qemu/option.h | 2 | ||||
| -rw-r--r-- | 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 8c0ac3485e..1077b69851 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 c188c5ce6c..2c467918be 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, |