From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NIPZf-0008Uh-2R for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:39:35 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NIPZb-0008Ru-5N for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:39:34 -0500 Received: from [199.232.76.173] (port=48832 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NIPZb-0008Rh-0W for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:39:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34434) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NIPZa-0007N7-CN for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:39:30 -0500 From: Luiz Capitulino Date: Wed, 9 Dec 2009 14:27:51 -0200 Message-Id: <1260376078-8694-13-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1260376078-8694-1-git-send-email-lcapitulino@redhat.com> References: <1260376078-8694-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 12/19] monitor: Convert do_info_uuid() to QObject List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com snprintf() is used because the UUID_FMT is too complex for qobject_from_jsonf(). Signed-off-by: Luiz Capitulino --- monitor.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 72fd573..f0cb759 100644 --- a/monitor.c +++ b/monitor.c @@ -594,13 +594,32 @@ static void do_info_hpet(Monitor *mon, QObject **ret_data) } #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[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_from_jsonf("{ 'UUID': %s }", uuid); } /* get the current CPU defined by the user */ @@ -2495,7 +2514,8 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .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) { -- 1.6.6.rc1.39.g9a42