On Mon, May 04, 2015 at 04:09:58PM -0300, Eduardo Habkost wrote: > This will allow clients to query additional information directly using > qom-get on the CPU objects. > > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
I'm not sure if it's the only way to accomplish what we need in these
new schemes, but it seems like a reasonable thing to have regardless.
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> Reference to previous discussion:
>
> Date: Mon, 4 May 2015 15:37:40 -0300
> From: Eduardo Habkost <ehabk...@redhat.com>
> Message-ID: <20150504183740.gm17...@thinpad.lan.raisama.net>
> Subject: Re: [Qemu-devel] [PATCH] cpu: Register QOM links at
> /machine/cpus/<index>
>
> The summary is: even if we provide predictable QOM paths for the CPU
> objects, the qom-path field will be useful to allow the QOM objects and
> query-cpu data to be matched correctly.
> ---
> cpus.c | 1 +
> qapi-schema.json | 7 +++++--
> qmp-commands.hx | 1 +
> 3 files changed, 7 insertions(+), 2 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 ac9594d..7a52a78 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -602,6 +602,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.
> +#
> # @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
> @@ -622,8 +624,9 @@
> # data is sent to the client, the guest may no longer be halted.
> ##
> { 'type': '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 d4a837c..5c92162 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)
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
pgpGxa7fzxVZz.pgp
Description: PGP signature
