Add option to turn on JSON pretty printing in monitor

Expaned '-mon' arg to allow a 'pretty=on' flag. This makes the
monitor pretty print its replies to easy human debugging / reading

Signed-off-by: Daniel P. Berrange <[email protected]>
Signed-off-by: Luiz Capitulino <[email protected]>

diff --git a/monitor.c b/monitor.c
index e602480ebb39bb15aae749d09fd5d9089074ef79..a33cdc2a0050e78d40295ac122824b2a32628079 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -351,7 +351,10 @@ static void monitor_json_emitter(Monitor *mon, const QObject *data)
 {
     QString *json;
 
-    json = qobject_to_json(data);
+    if (mon->flags & MONITOR_USE_PRETTY)
+       json = qobject_to_json_pretty(data);
+    else
+       json = qobject_to_json(data);
     assert(json != NULL);
 
     qstring_append_chr(json, '\n');

diff --git a/monitor.h b/monitor.h
index 38b22a4b285bf09f96eb639732eaad3e9a07e69a..f2122b5884577511edc4f41e7467abcc61a1ab2c 100644 (file)
--- a/monitor.h
+++ b/monitor.h
@@ -14,6 +14,7 @@ extern Monitor *default_mon;
 #define MONITOR_IS_DEFAULT    0x01
 #define MONITOR_USE_READLINE  0x02
 #define MONITOR_USE_CONTROL   0x04
+#define MONITOR_USE_PRETTY    0x08
 
 /* flags for monitor commands */
 #define MONITOR_CMD_ASYNC       0x0001

diff --git a/qemu-config.c b/qemu-config.c
index e3b746cc2bdf8f4719a241f7d05534354768d03a..6052a289e903b065352dc57e4b3645542cc39c8a 100644 (file)
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -283,6 +283,9 @@ static QemuOptsList qemu_mon_opts = {
         },{
             .name = "default",
             .type = QEMU_OPT_BOOL,
+        },{
+            .name = "pretty",
+            .type = QEMU_OPT_BOOL,
         },
         { /* end of list */ }
     },

diff --git a/vl.c b/vl.c
index d352d18cfe61bf67ec59a98f8014a56e2778a977..939ee87b66b41daa74c8fcd0f1f878a02294d03e 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -1562,6 +1562,9 @@ static int mon_init_func(QemuOpts *opts, void *opaque)
         exit(1);
     }
 
+    if (qemu_opt_get_bool(opts, "pretty", 0))
+        flags |= MONITOR_USE_PRETTY;
+
     if (qemu_opt_get_bool(opts, "default", 0))
         flags |= MONITOR_IS_DEFAULT;