[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/26] qmp: Add qom_path field to query-cpus command
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 01/26] qmp: Add qom_path field to query-cpus command |
Date: |
Fri, 15 May 2015 10:24:27 +0200 |
From: Eduardo Habkost <address@hidden>
This will allow clients to query additional information directly using
qom-get on the CPU objects.
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
cpus.c | 1 +
qapi-schema.json | 8 ++++++--
qmp-commands.hx | 7 +++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/cpus.c b/cpus.c
index 62d157a..de6469f 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1435,6 +1435,7 @@ CpuInfoList *qmp_query_cpus(Error **errp)
info->value->CPU = cpu->cpu_index;
info->value->current = (cpu == first_cpu);
info->value->halted = cpu->halted;
+ info->value->qom_path = object_get_canonical_path(OBJECT(cpu));
info->value->thread_id = cpu->thread_id;
#if defined(TARGET_I386)
info->value->has_pc = true;
diff --git a/qapi-schema.json b/qapi-schema.json
index 9c92482..f97ffa1 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -679,6 +679,8 @@
# @halted: true if the virtual CPU is in the halt state. Halt usually refers
# to a processor specific low power mode.
#
+# @qom_path: path to the CPU object in the QOM tree (since 2.4)
+#
# @pc: #optional If the target is i386 or x86_64, this is the 64-bit
instruction
# pointer.
# If the target is Sparc, this is the PC component of the
@@ -699,8 +701,10 @@
# data is sent to the client, the guest may no longer be halted.
##
{ 'struct': 'CpuInfo',
- 'data': {'CPU': 'int', 'current': 'bool', 'halted': 'bool', '*pc': 'int',
- '*nip': 'int', '*npc': 'int', '*PC': 'int', 'thread_id': 'int'} }
+ 'data': {'CPU': 'int', 'current': 'bool', 'halted': 'bool',
+ 'qom_path': 'str',
+ '*pc': 'int', '*nip': 'int', '*npc': 'int', '*PC': 'int',
+ 'thread_id': 'int'} }
##
# @query-cpus:
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 7506774..14e109e 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2569,6 +2569,7 @@ Return a json-array. Each CPU is represented by a
json-object, which contains:
- "CPU": CPU index (json-int)
- "current": true if this is the current CPU, false otherwise (json-bool)
- "halted": true if the cpu is halted, false otherwise (json-bool)
+- "qom_path": path to the CPU object in the QOM tree (json-str)
- Current program counter. The key's name depends on the architecture:
"pc": i386/x86_64 (json-int)
"nip": PPC (json-int)
@@ -2585,14 +2586,16 @@ Example:
"CPU":0,
"current":true,
"halted":false,
- "pc":3227107138
+ "qom_path":"/machine/unattached/device[0]",
+ "pc":3227107138,
"thread_id":3134
},
{
"CPU":1,
"current":false,
"halted":true,
- "pc":7108165
+ "qom_path":"/machine/unattached/device[2]",
+ "pc":7108165,
"thread_id":3135
}
]
--
1.9.3
- [Qemu-devel] [PULL 00/26] qapi: Fix qapi mangling of downstream names, and more, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 02/26] doc: fix qmp event type, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 08/26] qapi: Use c_enum_const() in generate_alternate_qtypes(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 01/26] qmp: Add qom_path field to query-cpus command,
Markus Armbruster <=
- [Qemu-devel] [PULL 07/26] qapi: Simplify c_enum_const(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 05/26] qapi: Rename _generate_enum_string() to camel_to_upper(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 06/26] qapi: Rename generate_enum_full_value() to c_enum_const(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 14/26] qapi: Support downstream simple unions, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 03/26] qapi: Fix C identifiers generated for names containing '.', Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 18/26] tests: Add missing dependencies on $(qapi-py), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 26/26] qapi: Inline gen_command_decl_prologue(), gen_command_def_prologue(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 25/26] qapi: Drop pointless flush() before close(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 20/26] qapi: qapi-commands.py option --type is unused, drop it, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 11/26] qapi: Make c_type() consistently convert qapi names, Markus Armbruster, 2015/05/15