From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtAvV-0005p5-5U for qemu-devel@nongnu.org; Fri, 15 May 2015 04:25:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtAvQ-0004Ue-1u for qemu-devel@nongnu.org; Fri, 15 May 2015 04:25:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtAvP-0004Tf-Pq for qemu-devel@nongnu.org; Fri, 15 May 2015 04:24:55 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4F8OstM012187 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 15 May 2015 04:24:55 -0400 From: Markus Armbruster Date: Fri, 15 May 2015 10:24:27 +0200 Message-Id: <1431678292-17692-2-git-send-email-armbru@redhat.com> In-Reply-To: <1431678292-17692-1-git-send-email-armbru@redhat.com> References: <1431678292-17692-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 01/26] qmp: Add qom_path field to query-cpus command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost From: Eduardo Habkost This will allow clients to query additional information directly using qom-get on the CPU objects. Reviewed-by: David Gibson Reviewed-by: Andreas F=C3=A4rber Signed-off-by: Eduardo Habkost Reviewed-by: Eric Blake Signed-off-by: Markus Armbruster --- 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 =3D cpu->cpu_index; info->value->current =3D (cpu =3D=3D first_cpu); info->value->halted =3D cpu->halted; + info->value->qom_path =3D object_get_canonical_path(OBJECT(cpu))= ; info->value->thread_id =3D cpu->thread_id; #if defined(TARGET_I386) info->value->has_pc =3D 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 r= efers # 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 ins= truction # 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': 'in= t', - '*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'} } =20 ## # @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 j= son-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 } ] --=20 1.9.3