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 <lcapitul...@redhat.com>
---
monitor.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index ab21db4..eb46926 100644
--- a/monitor.c
+++ b/monitor.c
@@ -385,13 +385,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 */
@@ -2222,7 +2230,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.5.3.148.g785c5
