[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/17] monitor: Convert do_info_kvm() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 07/17] monitor: Convert do_info_kvm() to QObject |
Date: |
Mon, 23 Nov 2009 18:06:13 -0200 |
Return a QString with kvm status information.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/monitor.c b/monitor.c
index c9104c3..c2e82c8 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1551,17 +1551,35 @@ 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)
{
+ monitor_printf(mon, "kvm support: %s\n",
+ qstring_get_str(qobject_to_qstring(data)));
+}
+
+/**
+ * do_info_kvm(): Show KVM information
+ *
+ * Return a QString with KVM information, which can be:
+ *
+ * - "enabled"
+ * - "disabled"
+ * - "not compiled"
+ */
+static void do_info_kvm(Monitor *mon, QObject **ret_data)
+{
+ QString *qs;
+
#ifdef CONFIG_KVM
- monitor_printf(mon, "kvm support: ");
if (kvm_enabled())
- monitor_printf(mon, "enabled\n");
+ qs = qstring_from_str("enabled");
else
- monitor_printf(mon, "disabled\n");
+ qs = qstring_from_str("disabled");
#else
- monitor_printf(mon, "kvm support: not compiled\n");
+ qs = qstring_from_str("not compiled");
#endif
+
+ *ret_data = QOBJECT(qs);
}
static void do_info_numa(Monitor *mon)
@@ -2094,7 +2112,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.5.3.148.g785c5
- [Qemu-devel] [PATCH v1 00/17]: info handlers conversions to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 01/17] Introduce qemu-objects.h header file, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 02/17] Makefile: move QObject objs to their own entry, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 03/17] QDict: Introduce qdict_get_qbool(), Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 04/17] QDict: Introduce qdict_get_qlist(), Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 05/17] monitor: Fix do_info_balloon() output, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 06/17] monitor: Convert do_info_status() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 07/17] monitor: Convert do_info_kvm() to QObject,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 08/17] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 09/17] monitor: Convert do_info_hpet() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 10/17] monitor: Convert do_info_uuid() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 11/17] monitor: Convert do_info_mice() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 12/17] migration: Convert do_info_migrate() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 13/17] block: Convert bdrv_info() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 15/17] char: Convert qemu_chr_info() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 14/17] block: Convert bdrv_info_stats() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 16/17] PCI: Convert pci_device_hot_add() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 17/17] VNC: Convert do_info_vnc() to QObject, Luiz Capitulino, 2009/11/23