Patchwork [12/14] monitor: Convert do_info_version() to QObject

login
register
mail settings
Submitter Luiz Capitulino
Date Oct. 1, 2009, 3:50 p.m.
Message ID <1254412245-10452-13-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/34747/
State Superseded
Headers show

Comments

Luiz Capitulino - Oct. 1, 2009, 3:50 p.m.
The returned data is always a QString.

Also introduces monitor_print_qobject(), which can be used as
a standard way to print QObjects in the user protocol format.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

Patch

diff --git a/monitor.c b/monitor.c
index 852e558..1b52355 100644
--- a/monitor.c
+++ b/monitor.c
@@ -247,6 +247,24 @@  static void monitor_print_parsing_err(Monitor *mon, MonitorError *error)
     monitor_puts(mon, "\n");
 }
 
+static void monitor_print_qobject(Monitor *mon, const QObject *data)
+{
+    switch (qobject_type(data)) {
+        case QTYPE_QSTRING:
+            monitor_printf(mon, "%s",qstring_get_str(qobject_to_qstring(data)));
+            break;
+        case QTYPE_QINT:
+            monitor_printf(mon, "%" PRId64,qint_get_int(qobject_to_qint(data)));
+            break;
+        default:
+            monitor_printf(mon, "ERROR: unsupported type: %d",
+                                                        qobject_type(data));
+            break;
+    }
+
+    monitor_puts(mon, "\n");
+}
+
 static int compare_cmd(const char *name, const char *list)
 {
     const char *p, *pstart;
@@ -357,9 +375,13 @@  help:
     help_cmd(mon, "info");
 }
 
-static void do_info_version(Monitor *mon)
+/**
+ * do_info_version(): Show QEMU version
+ */
+static void do_info_version(Monitor *mon, QObject **ret_data,
+                            MonitorError *error)
 {
-    monitor_printf(mon, "%s\n", QEMU_VERSION QEMU_PKGVERSION);
+    *ret_data = QOBJECT(qstring_from_str(QEMU_VERSION QEMU_PKGVERSION));
 }
 
 static void do_info_name(Monitor *mon)
@@ -1894,8 +1916,8 @@  static const mon_cmd_t info_cmds[] = {
         .name       = "version",
         .args_type  = "",
         .handler    = do_info_version,
-        .user_print = NULL,
-        .user_error = NULL,
+        .user_print = monitor_print_qobject,
+        .user_error = monitor_error_noop,
         .params     = "",
         .help       = "show the version of QEMU"
     },