[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/19] monitor: Convert do_info_kvm() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 09/19] monitor: Convert do_info_kvm() to QObject |
Date: |
Wed, 9 Dec 2009 14:27:48 -0200 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/monitor.c b/monitor.c
index e7a6294..47f794d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1783,16 +1783,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
}
@@ -2346,7 +2370,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
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, (continued)
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Daniel P. Berrange, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Daniel P. Berrange, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/11
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Anthony Liguori, 2009/12/11
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Anthony Liguori, 2009/12/11
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Daniel P. Berrange, 2009/12/11
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Anthony Liguori, 2009/12/11
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/11
[Qemu-devel] [PATCH 09/19] monitor: Convert do_info_kvm() to QObject,
Luiz Capitulino <=
[Qemu-devel] [PATCH 11/19] monitor: Convert do_info_hpet() to QObject, Luiz Capitulino, 2009/12/09
[Qemu-devel] [PATCH 12/19] monitor: Convert do_info_uuid() to QObject, Luiz Capitulino, 2009/12/09
[Qemu-devel] [PATCH 13/19] monitor: Convert do_info_mice() to QObject, Luiz Capitulino, 2009/12/09
[Qemu-devel] [PATCH 14/19] migration: Convert do_info_migrate() to QObject, Luiz Capitulino, 2009/12/09
[Qemu-devel] [PATCH 15/19] block: Convert bdrv_info() to QObject, Luiz Capitulino, 2009/12/09
[Qemu-devel] [PATCH 16/19] block: Convert bdrv_info_stats() to QObject, Luiz Capitulino, 2009/12/09
[Qemu-devel] [PATCH 17/19] char: Convert qemu_chr_info() to QObject, Luiz Capitulino, 2009/12/09
[Qemu-devel] [PATCH 18/19] PCI: Convert pci_device_hot_add() to QObject, Luiz Capitulino, 2009/12/09