[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/14] monitor: Convert do_info_version() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 12/14] monitor: Convert do_info_version() to QObject |
Date: |
Thu, 1 Oct 2009 12:50:43 -0300 |
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 <address@hidden>
---
monitor.c | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
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"
},
--
1.6.5.rc2
- [Qemu-devel] [PATCH 01/14] QObject: Accept NULL, (continued)
- [Qemu-devel] [PATCH 01/14] QObject: Accept NULL, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 02/14] Introduce monitor-error module, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 03/14] monitor: Add new members to mon_cmd_t, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 04/14] monitor: Handle new and old style handlers, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 06/14] monitor: do_info(): handle new and old info handlers, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 05/14] monitor: Initial MonitorError usage, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 07/14] monitor: Convert do_quit() do QObject, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 08/14] monitor: Convert do_stop() to QObject, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 09/14] monitor: Convert do_system_reset() to QObject, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 10/14] monitor: Convert do_system_powerdown() to QObject, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 12/14] monitor: Convert do_info_version() to QObject,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 11/14] monitor: Convert do_balloon() to QObject, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 13/14] monitor-error: Add do_info_balloon() errors, Luiz Capitulino, 2009/10/01
- [Qemu-devel] [PATCH 14/14] monitor: Convert do_info_balloon() to QObject, Luiz Capitulino, 2009/10/01
- [Qemu-devel] Re: [PATCH v1 00/14]: Initial QObject conversion, Avi Kivity, 2009/10/01
- Re: [Qemu-devel] [PATCH v1 00/14]: Initial QObject conversion, Gerd Hoffmann, 2009/10/02