[Qemu-devel] [PATCH v24 11/31] qemu_opts_print: change fprintf stderr to printf

[Chunyan Liu]

Currently this function is not used anywhere. In later patches, it will
replace print_option_parameters. print_option_parameters uses printf,
to avoid print info changes after switching to QemuOpts, change
qemu_opts_print from fprintf stderr to printf to keep consistent.

Also to avoid print info changes, remove last printf and print size/number
with opt->value.uint instead of opt->str.

Signed-off-by: Chunyan Liu <cy...@suse.com>
---
Changes:
  * remove last printf
  * add printf opt->value.uint for size/number type, keep same with
    QEMUOptionParameter print. (e.g. 10M printed as 10485760)

 util/qemu-option.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/util/qemu-option.c b/util/qemu-option.c
index c4c7545..dc484a9 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -1032,7 +1032,7 @@ void qemu_opts_print(QemuOpts *opts)
 
     if (desc[0].name == NULL) {
         QTAILQ_FOREACH(opt, &opts->head, next) {
-            fprintf(stderr, "%s=\"%s\" ", opt->name, opt->str);
+            printf("%s=\"%s\" ", opt->name, opt->str);
         }
         return;
     }
@@ -1045,12 +1045,14 @@ void qemu_opts_print(QemuOpts *opts)
             continue;
         }
         if (desc->type == QEMU_OPT_STRING) {
-            fprintf(stderr, "%s='%s' ", desc->name, value);
+            printf("%s='%s' ", desc->name, value);
+        } else if ((desc->type == QEMU_OPT_SIZE ||
+                    desc->type == QEMU_OPT_NUMBER) && opt) {
+            printf("%s=%" PRId64 " ", desc->name, opt->value.uint);
         } else {
-            fprintf(stderr, "%s=%s ", desc->name, value);
+            printf("%s=%s ", desc->name, value);
         }
     }
-    fprintf(stderr, "\n");
 }
 
 static int opts_do_parse(QemuOpts *opts, const char *params,
-- 
1.7.12.4