[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/17] monitor: Convert do_info_uuid() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 10/17] monitor: Convert do_info_uuid() to QObject |
Date: |
Fri, 4 Dec 2009 15:11:28 -0200 |
The returned QObject is a QString, snprintf() is used because the
UUID_FMT is too complex for qobject_from_jsonf().
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index f9a698f..961f6e1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -572,13 +572,21 @@ static void do_info_hpet(Monitor *mon, QObject **ret_data)
}
#endif
-static void do_info_uuid(Monitor *mon)
+/**
+ * do_info_uuid(): Show VM UUID
+ *
+ * Return a QString with the current VM UUID.
+ */
+static void do_info_uuid(Monitor *mon, QObject **ret_data)
{
- monitor_printf(mon, UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1],
+ char uuid[64];
+
+ snprintf(uuid, sizeof(uuid), UUID_FMT, qemu_uuid[0], qemu_uuid[1],
qemu_uuid[2], qemu_uuid[3], qemu_uuid[4], qemu_uuid[5],
qemu_uuid[6], qemu_uuid[7], qemu_uuid[8], qemu_uuid[9],
qemu_uuid[10], qemu_uuid[11], qemu_uuid[12], qemu_uuid[13],
qemu_uuid[14], qemu_uuid[15]);
+ *ret_data = QOBJECT(qstring_from_str(uuid));
}
/* get the current CPU defined by the user */
@@ -2416,7 +2424,8 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the current VM UUID",
- .mhandler.info = do_info_uuid,
+ .user_print = monitor_print_qobject,
+ .mhandler.info_new = do_info_uuid,
},
#if defined(TARGET_PPC)
{
--
1.6.6.rc1.5.ge21a85
- [Qemu-devel] [PATCH 03/17] QDict: Introduce qdict_get_qbool(), (continued)
- [Qemu-devel] [PATCH 03/17] QDict: Introduce qdict_get_qbool(), Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 04/17] QDict: Introduce qdict_get_qlist(), Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 05/17] monitor: Fix do_info_balloon() output, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 06/17] monitor: Convert do_info_status() to QObject, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 07/17] monitor: Convert do_info_kvm() to QObject, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 08/17] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 09/17] monitor: Convert do_info_hpet() to QObject, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 10/17] monitor: Convert do_info_uuid() to QObject,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 11/17] monitor: Convert do_info_mice() to QObject, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 12/17] migration: Convert do_info_migrate() to QObject, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 13/17] block: Convert bdrv_info() to QObject, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 14/17] block: Convert bdrv_info_stats() to QObject, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 15/17] char: Convert qemu_chr_info() to QObject, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 16/17] PCI: Convert pci_device_hot_add() to QObject, Luiz Capitulino, 2009/12/04
- [Qemu-devel] [PATCH 17/17] VNC: Convert do_info_vnc() to QObject, Luiz Capitulino, 2009/12/04