From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLLLw-0008Fu-JT for qemu-devel@nongnu.org; Thu, 07 Jul 2016 22:17:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLLLq-00082A-Hp for qemu-devel@nongnu.org; Thu, 07 Jul 2016 22:17:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56637) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLLLq-000820-9D for qemu-devel@nongnu.org; Thu, 07 Jul 2016 22:17:10 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 420F6C049D67 for ; Fri, 8 Jul 2016 02:17:09 +0000 (UTC) Date: Fri, 8 Jul 2016 12:18:55 +1000 From: David Gibson Message-ID: <20160708121855.36e0702d@voom.fritz.box> In-Reply-To: <59c8f2c8e80d705fb4981bddd9fe703c1205346c.1467904342.git.pkrempa@redhat.com> References: <59c8f2c8e80d705fb4981bddd9fe703c1205346c.1467904342.git.pkrempa@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/XK09m/dpvjMqT1ZHzyIuD0Q"; protocol="application/pgp-signature" Subject: Re: [Qemu-devel] [RFC PATCH 1/2] qapi: Add vcpu id to query-hotpluggable-cpus output List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Krempa Cc: qemu-devel@nongnu.org, imammedo@redhat.com --Sig_/XK09m/dpvjMqT1ZHzyIuD0Q Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Thu, 7 Jul 2016 17:17:13 +0200 Peter Krempa wrote: > Add 'vcpu index' to the output of query hotpluggable cpus. This output > is identical to the linear cpu index taken by the 'cpus' attribute > passed to -numa. The problem is, the vcpu index of what? Each entry in the hotpluggable cpus table could represent more than one vcpu. > This will allow to reliably map the cpu number to a given topology > element without making mgmt apps to reimplement the mapping. >=20 > Signed-off-by: Peter Krempa > --- > hmp.c | 1 + > hw/i386/pc.c | 1 + > hw/ppc/spapr.c | 1 + > qapi-schema.json | 2 ++ > 4 files changed, 5 insertions(+) >=20 > diff --git a/hmp.c b/hmp.c > index 0cf5baa..613601e 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -2450,6 +2450,7 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDic= t *qdict) > monitor_printf(mon, " type: \"%s\"\n", l->value->type); > monitor_printf(mon, " vcpus_count: \"%" PRIu64 "\"\n", > l->value->vcpus_count); > + monitor_printf(mon, " vcpu_id: \"%" PRIu64 "\"\n", l->value->vc= pu_id); > if (l->value->has_qom_path) { > monitor_printf(mon, " qom_path: \"%s\"\n", l->value->qom_pa= th); > } > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index f293a0c..4ba02c4 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -2131,6 +2131,7 @@ static HotpluggableCPUList *pc_query_hotpluggable_c= pus(MachineState *machine) >=20 > cpu_item->type =3D g_strdup(cpu_type); > cpu_item->vcpus_count =3D 1; > + cpu_item->vcpu_id =3D i; > cpu_props->has_socket_id =3D true; > cpu_props->socket_id =3D topo.pkg_id; > cpu_props->has_core_id =3D true; > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 7f33a1b..d1f5195 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2378,6 +2378,7 @@ static HotpluggableCPUList *spapr_query_hotpluggabl= e_cpus(MachineState *machine) >=20 > cpu_item->type =3D spapr_get_cpu_core_type(machine->cpu_model); > cpu_item->vcpus_count =3D smp_threads; > + cpu_item->vcpu_id =3D i; This is wrong. This is the index of the core. The individual vcpus within the core will have ids starting at core_id and working up. > cpu_props->has_core_id =3D true; > cpu_props->core_id =3D i * smt; > /* TODO: add 'has_node/node' here to describe > diff --git a/qapi-schema.json b/qapi-schema.json > index ba3bf14..6db9294 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -4292,6 +4292,7 @@ > # @type: CPU object type for usage with device_add command > # @props: list of properties to be used for hotplugging CPU > # @vcpus-count: number of logical VCPU threads @HotpluggableCPU provides > +# @vcpu-id: linear index of the vcpu > # @qom-path: #optional link to existing CPU object if CPU is present or > # omitted if CPU is not present. > # > @@ -4300,6 +4301,7 @@ > { 'struct': 'HotpluggableCPU', > 'data': { 'type': 'str', > 'vcpus-count': 'int', > + 'vcpu-id': 'int', > 'props': 'CpuInstanceProperties', > '*qom-path': 'str' > } > --=20 > 2.9.0 >=20 --=20 David Gibson Senior Software Engineer, Virtualization, Red Hat --Sig_/XK09m/dpvjMqT1ZHzyIuD0Q Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXfw2PAAoJEGw4ysog2bOSr0EP/0QUi20g48CHUkM2+Js6PXmu xKQ3aPJtMz+I6qxW0wIqds41tqpKZ6IZqSqaKzDPh7/ajn4NwauAdbAvB4osrsRn uOVE/U/zgwFN5sjsWlpk2PWw/zqcBO1kW1edu6s+XuWzRwSL5Da3+KAqMhGz6r+c s+rgYRy/n/c9PlDyCIFkPolIZt8x7i6zt9CotWt4rsjGSKdkLOJPcBsb5JwgO6P7 PL6CEggtx2hBctiIY42n6jDCHjmWSYU8bbEgp8cPFEe7befWqxGuexVhNjYHRT+Q sp/Cb9TT79vV2BwmO63EFzJcMSJ01Ug8+rvSlpbczr1n8QTbSDJk/8np2IDWzVGc aq6exZyPo/GxjSTIAPHVYodf5WLBx4mAWo7gInOUAv6mhF4H3qW0zt6EP0X+gIdE UC/qYQ9afKTY0f+5STkTq+A426+UNA/fj/Z/Wm1/kiuJx8kkHSW5l8oDiQxdTZ6s MkuQEHaJDk7FXG0qA3f+1SerDkyavMFnTZPM0ObR9pEsLa+M6pIk1qFZcYB2Rl08 tvp3WufvlXx61TXSjse6cQukMA9E+2QlzzP1LV1HaWBRyU2FdcSQCig83pyhhHxP t2HowS2rtJaNK8hEwrFJ55w6XKsNdQ0P3Rn6oKLuZ+xLWXu9qZTbx4IOvFUwt8Lo GYkF/XR7/To4/pJN6DtD =DvSK -----END PGP SIGNATURE----- --Sig_/XK09m/dpvjMqT1ZHzyIuD0Q--