[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/18] monitor: Convert do_info_version() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 16/18] monitor: Convert do_info_version() to QObject |
Date: |
Wed, 7 Oct 2009 13:32:13 -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 | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index 22e87ab..8c9cc9b 100644
--- a/monitor.c
+++ b/monitor.c
@@ -223,6 +223,24 @@ static inline int monitor_handler_ported(const mon_cmd_t
*cmd)
return cmd->user_print != NULL;
}
+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;
@@ -322,9 +340,12 @@ 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)
{
- 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)
@@ -1860,7 +1881,8 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the version of QEMU",
- .mhandler.info = do_info_version,
+ .user_print = monitor_print_qobject,
+ .mhandler.info_new = do_info_version,
},
{
.name = "network",
--
1.6.5.rc2.17.gdbc1b
- [Qemu-devel] [PATCH 06/18] monitor: union for command handlers, (continued)
- [Qemu-devel] [PATCH 06/18] monitor: union for command handlers, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 07/18] monitor: Add user_print() to mon_cmd_t, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 08/18] monitor: Handle new and old style handlers, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 09/18] monitor: do_info(): handle new and old info handlers, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 10/18] monitor: Convert do_quit() do QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 11/18] monitor: Convert do_stop() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 12/18] monitor: Convert do_system_reset() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 13/18] monitor: Convert do_system_powerdown() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 14/18] monitor: Convert do_cont() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 15/18] monitor: Convert do_balloon() to QObject, Luiz Capitulino, 2009/10/07
- [Qemu-devel] [PATCH 16/18] monitor: Convert do_info_version() to QObject,
Luiz Capitulino <=