[V6,07/10] add def_print_str and use it in qemu_opts_print.

Submitted by Robert Wang on Nov. 23, 2012, 7:47 a.m.

Details

Message ID 1353656865-20910-8-git-send-email-wdongxu@linux.vnet.ibm.com
State New
Headers show

Commit Message

Robert Wang Nov. 23, 2012, 7:47 a.m.
qemu_opts_print has no user now, so can re-write the function safely.

qemu_opts_print will be used while using "qemu-img create", it will
produce the same output as previous code.

The behavior of this function has changed:

1. Print every possible option, whether a value has been set or not.
2. Option descriptors may provide a default value.
3. Print to stdout instead of stderr.

Previously the behavior was to print every option that has been set.
Options that have not been set would be skipped.

Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
---
 qemu-option.c |   27 ++++++++++++++++++++-------
 qemu-option.h |    1 +
 2 files changed, 21 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/qemu-option.c b/qemu-option.c
index 94557cf..e0628da 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -862,15 +862,28 @@  void qemu_opts_del(QemuOpts *opts)
 
 int qemu_opts_print(QemuOpts *opts, void *dummy)
 {
-    QemuOpt *opt;
+    QemuOptDesc *desc = opts->list->desc;
 
-    fprintf(stderr, "%s: %s:", opts->list->name,
-            opts->id ? opts->id : "<noid>");
-    QTAILQ_FOREACH(opt, &opts->head, next) {
-        fprintf(stderr, " %s=\"%s\"", opt->name, opt->str);
+    for (desc = opts->list->desc; desc && desc->name; desc++) {
+        const char *value = desc->def_print_str;
+        QemuOpt *opt;
+
+        opt = qemu_opt_find(opts, desc->name);
+        if (opt) {
+            value = opt->str;
+        }
+
+        if (!value) {
+            continue;
+        }
+
+        if (desc->type == QEMU_OPT_STRING) {
+            printf("%s='%s' ", desc->name, value);
+        } else {
+            printf("%s=%s ", desc->name, value);
+        }
     }
-    fprintf(stderr, "\n");
-    return 0;
+     return 0;
 }
 
 static int opts_do_parse(QemuOpts *opts, const char *params,
diff --git a/qemu-option.h b/qemu-option.h
index 002dd07..ab02023 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -96,6 +96,7 @@  typedef struct QemuOptDesc {
     const char *name;
     enum QemuOptType type;
     const char *help;
+    const char *def_print_str;
 } QemuOptDesc;
 
 struct QemuOptsList {