[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/20] monitor: do_info_cpus(): Use QBool
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 07/20] monitor: do_info_cpus(): Use QBool |
Date: |
Thu, 10 Dec 2009 12:43:22 -0200 |
While there update the documentation as well.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/monitor.c b/monitor.c
index 5010ce4..49db7cf 100644
--- a/monitor.c
+++ b/monitor.c
@@ -635,8 +635,9 @@ static void print_cpu_iter(QObject *obj, void *opaque)
assert(qobject_type(obj) == QTYPE_QDICT);
cpu = qobject_to_qdict(obj);
- if (strcmp(qdict_get_str(cpu, "current"), "yes") == 0)
+ if (qdict_get_bool(cpu, "current")) {
active = '*';
+ }
monitor_printf(mon, "%c CPU #%d: ", active, (int)qdict_get_int(cpu,
"CPU"));
@@ -656,8 +657,9 @@ static void print_cpu_iter(QObject *obj, void *opaque)
(target_long) qdict_get_int(cpu, "PC"));
#endif
- if (strcmp(qdict_get_str(cpu, "halted"), "yes") == 0)
+ if (qdict_get_bool(cpu, "halted")) {
monitor_printf(mon, " (halted)");
+ }
monitor_printf(mon, "\n");
}
@@ -674,12 +676,21 @@ static void monitor_print_cpus(Monitor *mon, const
QObject *data)
/**
* do_info_cpus(): Show CPU information
*
- * Return a QList with a QDict for each CPU.
+ * Return a QList. Each CPU is represented by a QDict, which contains:
*
- * For example:
+ * - "cpu": CPU index
+ * - "current": true if this is the current CPU, false otherwise
+ * - "halted": true if the cpu is halted, false otherwise
+ * - Current program counter. The key's name depends on the architecture:
+ * "pc": i386/x86)64
+ * "nip": PPC
+ * "pc" and "npc": sparc
+ * "PC": mips
*
- * [ { "CPU": 0, "current": "yes", "pc": 0x..., "halted": "no" },
- * { "CPU": 1, "current": "no", "pc": 0x..., "halted": "yes" } ]
+ * Example:
+ *
+ * [ { "CPU": 0, "current": true, "halted": false, "pc": 3227107138 },
+ * { "CPU": 1, "current": false, "halted": true, "pc": 7108165 } ]
*/
static void do_info_cpus(Monitor *mon, QObject **ret_data)
{
@@ -692,14 +703,17 @@ static void do_info_cpus(Monitor *mon, QObject **ret_data)
mon_get_cpu();
for(env = first_cpu; env != NULL; env = env->next_cpu) {
- const char *answer;
- QDict *cpu = qdict_new();
+ QDict *cpu;
+ QObject *obj;
cpu_synchronize_state(env);
- qdict_put(cpu, "CPU", qint_from_int(env->cpu_index));
- answer = (env == mon->mon_cpu) ? "yes" : "no";
- qdict_put(cpu, "current", qstring_from_str(answer));
+ obj = qobject_from_jsonf("{ 'CPU': %d, 'current': %i, 'halted': %i }",
+ env->cpu_index, env == mon->mon_cpu,
+ env->halted);
+ assert(obj != NULL);
+
+ cpu = qobject_to_qdict(obj);
#if defined(TARGET_I386)
qdict_put(cpu, "pc", qint_from_int(env->eip + env->segs[R_CS].base));
@@ -711,8 +725,6 @@ static void do_info_cpus(Monitor *mon, QObject **ret_data)
#elif defined(TARGET_MIPS)
qdict_put(cpu, "PC", qint_from_int(env->active_tc.PC));
#endif
- answer = env->halted ? "yes" : "no";
- qdict_put(cpu, "halted", qstring_from_str(answer));
qlist_append(cpu_list, cpu);
}
--
1.6.6.rc1.39.g9a42
- [Qemu-devel] [FOR 0.12 v4 00/20]: info handlers conversions to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 01/20] Introduce qemu-objects.h header file, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 03/20] QDict: Introduce qdict_get_qbool(), Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 02/20] Makefile: move QObject objs to their own entry, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 04/20] QDict: Introduce qdict_get_qlist(), Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 05/20] monitor: Fix do_info_balloon() output, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 06/20] monitor: Fix do_info_commands() output, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 08/20] monitor: do_info_version(): Use QDict, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 07/20] monitor: do_info_cpus(): Use QBool,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 09/20] monitor: Convert do_info_status() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 10/20] monitor: Convert do_info_kvm() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 11/20] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 12/20] monitor: Convert do_info_hpet() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 13/20] monitor: Convert do_info_uuid() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 14/20] monitor: Convert do_info_mice() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 15/20] migration: Convert do_info_migrate() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 16/20] block: Convert bdrv_info() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 17/20] block: Convert bdrv_info_stats() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 18/20] char: Convert qemu_chr_info() to QObject, Luiz Capitulino, 2009/12/10