[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/39] QemuOpts: repurpose qemu_opts_print to replace
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 08/39] QemuOpts: repurpose qemu_opts_print to replace print_option_parameters |
Date: |
Mon, 16 Jun 2014 19:23:32 +0800 |
From: Chunyan Liu <address@hidden>
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>
Signed-off-by: Stefan Hajnoczi <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.9.3
- [Qemu-devel] [PULL 00/39] Block patches, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 01/39] configure: Enable dead code (lzo, snappy, quorum), Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 02/39] block: Drop superfluous conditionals around g_free(), Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 03/39] blockdev: Move 'serial' option to drive_init(), Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 04/39] blockdev: Rename drive_init(), drive_uninit() to drive_new(), drive_del(), Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 05/39] blockdev: Remove unused DriveInfo reference count, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 07/39] QemuOpts: move find_desc_by_name ahead for later calling, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 06/39] block/nfs: fix potential segfault on early callback, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 08/39] QemuOpts: repurpose qemu_opts_print to replace print_option_parameters,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 09/39] QemuOpts: add def_value_str to QemuOptDesc, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 10/39] qapi: output def_value_str when query command line options, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 11/39] QemuOpts: change opt->name|str from (const char *) to (char *), Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 12/39] QemuOpts: move qemu_opt_del ahead for later calling, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 13/39] QemuOpts: add qemu_opt_get_*_del functions for replace work, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 14/39] QemuOpts: add qemu_opts_print_help to replace print_option_help, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 15/39] QemuOpts: add conversion between QEMUOptionParameter to QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 16/39] QemuOpts: add qemu_opts_append to replace append_option_parameters, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 17/39] QemuOpts: check NULL input for qemu_opts_del, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 18/39] change block layer to support both QemuOpts and QEMUOptionParamter, Stefan Hajnoczi, 2014/06/16