ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitor: Convert do_info_uuid() to QObject 

snprintf() is used because the UUID_FMT is too complex for
qobject_from_jsonf().

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2009-12-10 17:16:03 -02:00 committed by Anthony Liguori
parent 14f0720df9
commit 9603ceba2e
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
monitor.c
View File

@ -621,13 +621,32 @@ static void do_info_hpet(Monitor *mon, QObject **ret_data)
} }
#endif #endif
static void do_info_uuid(Monitor *mon) static void do_info_uuid_print(Monitor *mon, const QObject *data)
{ {
monitor_printf(mon, UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], monitor_printf(mon, "%s\n", qdict_get_str(qobject_to_qdict(data), "UUID"));
}
/**
* do_info_uuid(): Show VM UUID
*
* Return a QDict with the following information:
*
* - "UUID": Universally Unique Identifier
*
* Example:
*
* { "UUID": "550e8400-e29b-41d4-a716-446655440000" }
*/
static void do_info_uuid(Monitor *mon, QObject **ret_data)
{
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[2], qemu_uuid[3], qemu_uuid[4], qemu_uuid[5],
qemu_uuid[6], qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], 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[10], qemu_uuid[11], qemu_uuid[12], qemu_uuid[13],
qemu_uuid[14], qemu_uuid[15]); qemu_uuid[14], qemu_uuid[15]);
*ret_data = qobject_from_jsonf("{ 'UUID': %s }", uuid);
} }
/* get the current CPU defined by the user */ /* get the current CPU defined by the user */
@ -2521,7 +2540,8 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "", .args_type = "",
.params = "", .params = "",
.help = "show the current VM UUID", .help = "show the current VM UUID",
.mhandler.info = do_info_uuid, .user_print = do_info_uuid_print,
.mhandler.info_new = do_info_uuid,
}, },
#if defined(TARGET_PPC) #if defined(TARGET_PPC)
{ {