From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NIkFY-0001QE-Jk for qemu-devel@nongnu.org; Thu, 10 Dec 2009 09:44:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NIkFU-0001Ns-To for qemu-devel@nongnu.org; Thu, 10 Dec 2009 09:44:12 -0500 Received: from [199.232.76.173] (port=45376 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NIkFU-0001No-G8 for qemu-devel@nongnu.org; Thu, 10 Dec 2009 09:44:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33650) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NIkFT-0004Do-BL for qemu-devel@nongnu.org; Thu, 10 Dec 2009 09:44:08 -0500 From: Luiz Capitulino Date: Thu, 10 Dec 2009 12:43:25 -0200 Message-Id: <1260456215-31022-11-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1260456215-31022-1-git-send-email-lcapitulino@redhat.com> References: <1260456215-31022-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 10/20] monitor: Convert do_info_kvm() 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 Signed-off-by: Luiz Capitulino --- monitor.c | 41 +++++++++++++++++++++++++++++++++-------- 1 files changed, 33 insertions(+), 8 deletions(-) diff --git a/monitor.c b/monitor.c index 01d5827..3f26c5a 100644 --- a/monitor.c +++ b/monitor.c @@ -1806,16 +1806,40 @@ static void tlb_info(Monitor *mon) #endif -static void do_info_kvm(Monitor *mon) +static void do_info_kvm_print(Monitor *mon, const QObject *data) { -#ifdef CONFIG_KVM + QDict *qdict; + + qdict = qobject_to_qdict(data); + monitor_printf(mon, "kvm support: "); - if (kvm_enabled()) - monitor_printf(mon, "enabled\n"); - else - monitor_printf(mon, "disabled\n"); + if (qdict_get_bool(qdict, "present")) { + monitor_printf(mon, "%s\n", qdict_get_bool(qdict, "enabled") ? + "enabled" : "disabled"); + } else { + monitor_printf(mon, "not compiled\n"); + } +} + +/** + * do_info_kvm(): Show KVM information + * + * Return a QDict with the following information: + * + * - "enabled": true if KVM support is enabled, false otherwise + * - "present": true if QEMU has KVM support, false otherwise + * + * Example: + * + * { "enabled": true, "present": true } + */ +static void do_info_kvm(Monitor *mon, QObject **ret_data) +{ +#ifdef CONFIG_KVM + *ret_data = qobject_from_jsonf("{ 'enabled': %i, 'present': true }", + kvm_enabled()); #else - monitor_printf(mon, "kvm support: not compiled\n"); + *ret_data = qobject_from_jsonf("{ 'enabled': false, 'present': false }"); #endif } @@ -2369,7 +2393,8 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show KVM information", - .mhandler.info = do_info_kvm, + .user_print = do_info_kvm_print, + .mhandler.info_new = do_info_kvm, }, { .name = "numa", -- 1.6.6.rc1.39.g9a42