[{"id":1767939,"web_url":"http://patchwork.ozlabs.org/comment/1767939/","msgid":"<20170913164215.0e587473@nial.brq.redhat.com>","list_archive_url":null,"date":"2017-09-13T14:42:15","subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","submitter":{"id":11305,"url":"http://patchwork.ozlabs.org/api/people/11305/","name":"Igor Mammedov","email":"imammedo@redhat.com"},"content":"On Wed, 13 Sep 2017 15:24:13 +0200\nDavid Hildenbrand wrote:\n\n> CPU hotplug is only possible on a per core basis on s390x. So let's\n> add possible_cpus and properly wire everything up.\n> \n> Signed-off-by: David Hildenbrand \nlooks good to me from cpu hotplug infrastructure pov,\n\nAcked-by: Igor Mammedov \n\n> ---\n> hw/s390x/s390-virtio-ccw.c | 41 +++++++++++++++++++++++++++++++++++++++++\n> qapi-schema.json | 16 ++++++++++++++++\n> 2 files changed, 57 insertions(+)\n> \n> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n> index 3be81d96af..cc64a81321 100644\n> --- a/hw/s390x/s390-virtio-ccw.c\n> +++ b/hw/s390x/s390-virtio-ccw.c\n> @@ -50,6 +50,7 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)\n> \n> static void s390_init_cpus(MachineState *machine)\n> {\n> + MachineClass *mc = MACHINE_GET_CLASS(machine);\n> int i;\n> gchar *name;\n> \n> @@ -74,6 +75,9 @@ static void s390_init_cpus(MachineState *machine)\n> g_free(name);\n> }\n> \n> + /* initialize possible_cpus */\n> + mc->possible_cpu_arch_ids(machine);\n> +\n> for (i = 0; i < smp_cpus; i++) {\n> s390x_new_cpu(machine->cpu_model, i, &error_fatal);\n> }\n> @@ -307,6 +311,7 @@ static void s390_cpu_plug(HotplugHandler *hotplug_dev,\n> DeviceState *dev, Error **errp)\n> {\n> gchar *name;\n> + MachineState *ms = MACHINE(hotplug_dev);\n> S390CPU *cpu = S390_CPU(dev);\n> CPUState *cs = CPU(dev);\n> \n> @@ -314,6 +319,9 @@ static void s390_cpu_plug(HotplugHandler *hotplug_dev,\n> object_property_set_link(OBJECT(hotplug_dev), OBJECT(cs), name,\n> errp);\n> g_free(name);\n> +\n> + g_assert(!ms->possible_cpus->cpus[cpu->env.core_id].cpu);\n> + ms->possible_cpus->cpus[cpu->env.core_id].cpu = OBJECT(dev);\n> }\n> \n> static void s390_machine_reset(void)\n> @@ -346,6 +354,36 @@ static void s390_machine_device_unplug_request(HotplugHandler *hotplug_dev,\n> }\n> }\n> \n> +static CpuInstanceProperties s390_cpu_index_to_props(MachineState *machine,\n> + unsigned cpu_index)\n> +{\n> + g_assert(machine->possible_cpus && cpu_index < machine->possible_cpus->len);\n> +\n> + return machine->possible_cpus->cpus[cpu_index].props;\n> +}\n> +\n> +static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms)\n> +{\n> + int i;\n> +\n> + if (ms->possible_cpus) {\n> + g_assert(ms->possible_cpus && ms->possible_cpus->len == max_cpus);\n> + return ms->possible_cpus;\n> + }\n> +\n> + ms->possible_cpus = g_malloc0(sizeof(CPUArchIdList) +\n> + sizeof(CPUArchId) * max_cpus);\n> + ms->possible_cpus->len = max_cpus;\n> + for (i = 0; i < ms->possible_cpus->len; i++) {\n> + ms->possible_cpus->cpus[i].vcpus_count = 1;\n> + ms->possible_cpus->cpus[i].arch_id = i;\n> + ms->possible_cpus->cpus[i].props.has_core_id = true;\n> + ms->possible_cpus->cpus[i].props.core_id = i;\n> + }\n> +\n> + return ms->possible_cpus;\n> +}\n> +\n> static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,\n> DeviceState *dev)\n> {\n> @@ -393,7 +431,10 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)\n> mc->no_sdcard = 1;\n> mc->use_sclp = 1;\n> mc->max_cpus = 248;\n> + mc->has_hotpluggable_cpus = true;\n> mc->get_hotplug_handler = s390_get_hotplug_handler;\n> + mc->cpu_index_to_instance_props = s390_cpu_index_to_props;\n> + mc->possible_cpu_arch_ids = s390_possible_cpu_arch_ids;\n> hc->plug = s390_machine_device_plug;\n> hc->unplug_request = s390_machine_device_unplug_request;\n> nc->nmi_monitor_handler = s390_nmi;\n> diff --git a/qapi-schema.json b/qapi-schema.json\n> index f3af2cb851..79e9f85404 100644\n> --- a/qapi-schema.json\n> +++ b/qapi-schema.json\n> @@ -3121,6 +3121,22 @@\n> # }\n> # ]}\n> #\n> +# For s390x-virtio-ccw machine type started with -smp 1,maxcpus=2 -cpu qemu\n> +# (Since: 2.11):\n> +#\n> +# -> { \"execute\": \"query-hotpluggable-cpus\" }\n> +# <- {\"return\": [\n> +# {\n> +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n> +# \"props\": { \"core-id\": 1 }\n> +# },\n> +# {\n> +# \"qom-path\": \"/machine/unattached/device[0]\",\n> +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n> +# \"props\": { \"core-id\": 0 }\n> +# }\n> +# ]}\n> +#\n> ##\n> { 'command': 'query-hotpluggable-cpus', 'returns': ['HotpluggableCPU'] }\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=imammedo@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xskt931X8z9sNw\n\tfor ;\n\tThu, 14 Sep 2017 00:43:12 +1000 (AEST)","from localhost ([::1]:42913 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds8sf-0005BA-W4\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 10:43:10 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:44070)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds8s1-00051k-LG\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:42:35 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds8rx-0002eb-Ba\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:42:29 -0400","from mx1.redhat.com ([209.132.183.28]:18615)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1ds8rx-0002e2-2X\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:42:25 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id D432A80F95;\n\tWed, 13 Sep 2017 14:42:23 +0000 (UTC)","from nial.brq.redhat.com (unknown [10.43.2.209])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id EAA1F17120;\n\tWed, 13 Sep 2017 14:42:16 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com D432A80F95","Date":"Wed, 13 Sep 2017 16:42:15 +0200","From":"Igor Mammedov ","To":"David Hildenbrand ","Message-ID":"<20170913164215.0e587473@nial.brq.redhat.com>","In-Reply-To":"<20170913132417.24384-19-david@redhat.com>","References":"<20170913132417.24384-1-david@redhat.com>\n\t<20170913132417.24384-19-david@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tWed, 13 Sep 2017 14:42:24 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tEduardo Habkost ,\n\tMarkus Armbruster , cohuck@redhat.com,\n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com, Paolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1767980,"web_url":"http://patchwork.ozlabs.org/comment/1767980/","msgid":"<20170913174933.5bc2f9ba.cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-13T15:49:33","subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/","name":"Cornelia Huck","email":"cohuck@redhat.com"},"content":"On Wed, 13 Sep 2017 15:24:13 +0200\nDavid Hildenbrand wrote:\n\n> CPU hotplug is only possible on a per core basis on s390x. So let's\n> add possible_cpus and properly wire everything up.\n\ns/properly wire everything up/wire everything up properly/\n\n?\n\n(fixing while... you get the idea)\n\n> \n> Signed-off-by: David Hildenbrand \n> ---\n> hw/s390x/s390-virtio-ccw.c | 41 +++++++++++++++++++++++++++++++++++++++++\n> qapi-schema.json | 16 ++++++++++++++++\n> 2 files changed, 57 insertions(+)","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xsmMP1ZsNz9sMN\n\tfor ;\n\tThu, 14 Sep 2017 01:50:09 +1000 (AEST)","from localhost ([::1]:43151 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds9vT-0008Au-7T\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 11:50:07 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:40593)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds9v9-0008Ah-Ba\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 11:49:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds9v5-0001vK-Fg\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 11:49:47 -0400","from mx1.redhat.com ([209.132.183.28]:50414)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1ds9v5-0001ti-93\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 11:49:43 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 2373A6E77E;\n\tWed, 13 Sep 2017 15:49:42 +0000 (UTC)","from gondolin (ovpn-117-3.ams2.redhat.com [10.36.117.3])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 23C456A501;\n\tWed, 13 Sep 2017 15:49:35 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 2373A6E77E","Date":"Wed, 13 Sep 2017 17:49:33 +0200","From":"Cornelia Huck ","To":"David Hildenbrand ","Message-ID":"<20170913174933.5bc2f9ba.cohuck@redhat.com>","In-Reply-To":"<20170913132417.24384-19-david@redhat.com>","References":"<20170913132417.24384-1-david@redhat.com>\n\t<20170913132417.24384-19-david@redhat.com>","Organization":"Red Hat GmbH","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tWed, 13 Sep 2017 15:49:42 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tEduardo Habkost ,\n\tMarkus Armbruster ,\n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com, Igor Mammedov ,\n\tPaolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1767981,"web_url":"http://patchwork.ozlabs.org/comment/1767981/","msgid":"<34bb9e7a-6f4b-0e87-d2ae-5e4305aff16e@redhat.com>","list_archive_url":null,"date":"2017-09-13T15:50:32","subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":"On 13.09.2017 17:49, Cornelia Huck wrote:\n> On Wed, 13 Sep 2017 15:24:13 +0200\n> David Hildenbrand wrote:\n> \n>> CPU hotplug is only possible on a per core basis on s390x. So let's\n>> add possible_cpus and properly wire everything up.\n> \n> s/properly wire everything up/wire everything up properly/\n> \n> ?\n> \n> (fixing while... you get the idea)\n\n:) Sure!","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xsmNg3fNCz9sPk\n\tfor ;\n\tThu, 14 Sep 2017 01:51:15 +1000 (AEST)","from localhost ([::1]:43162 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds9wX-0000gp-NM\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 11:51:13 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41055)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds9w5-0000g0-Rw\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 11:50:46 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds9w1-00039m-VE\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 11:50:45 -0400","from mx1.redhat.com ([209.132.183.28]:5683)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1ds9w1-00037e-H5\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 11:50:41 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 732487CDE8;\n\tWed, 13 Sep 2017 15:50:40 +0000 (UTC)","from [10.36.116.230] (ovpn-116-230.ams2.redhat.com [10.36.116.230])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C3ACA617BC;\n\tWed, 13 Sep 2017 15:50:33 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 732487CDE8","To":"Cornelia Huck ","References":"<20170913132417.24384-1-david@redhat.com>\n\t<20170913132417.24384-19-david@redhat.com>\n\t<20170913174933.5bc2f9ba.cohuck@redhat.com>","From":"David Hildenbrand ","Organization":"Red Hat GmbH","Message-ID":"<34bb9e7a-6f4b-0e87-d2ae-5e4305aff16e@redhat.com>","Date":"Wed, 13 Sep 2017 17:50:32 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170913174933.5bc2f9ba.cohuck@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tWed, 13 Sep 2017 15:50:40 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tEduardo Habkost ,\n\tMarkus Armbruster ,\n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com, Igor Mammedov ,\n\tPaolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1779495,"web_url":"http://patchwork.ozlabs.org/comment/1779495/","msgid":"<20171004100415.0f0ded10.cohuck@redhat.com>","list_archive_url":null,"date":"2017-10-04T08:04:15","subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/","name":"Cornelia Huck","email":"cohuck@redhat.com"},"content":"On Mon, 02 Oct 2017 09:46:41 +0200\nMarkus Armbruster wrote:\n\n> David Hildenbrand writes:\n> \n> > CPU hotplug is only possible on a per core basis on s390x. So let's\n> > add possible_cpus and properly wire everything up.\n> >\n> > Signed-off-by: David Hildenbrand \n> [...]\n> > diff --git a/qapi-schema.json b/qapi-schema.json\n> > index f3af2cb851..79e9f85404 100644\n> > --- a/qapi-schema.json\n> > +++ b/qapi-schema.json\n> > @@ -3121,6 +3121,22 @@\n> > # }\n> > # ]}\n> > #\n> > +# For s390x-virtio-ccw machine type started with -smp 1,maxcpus=2 -cpu qemu\n> > +# (Since: 2.11):\n> > +#\n> > +# -> { \"execute\": \"query-hotpluggable-cpus\" }\n> > +# <- {\"return\": [\n> > +# {\n> > +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n> > +# \"props\": { \"core-id\": 1 }\n> > +# },\n> > +# {\n> > +# \"qom-path\": \"/machine/unattached/device[0]\",\n> > +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n> > +# \"props\": { \"core-id\": 0 }\n> > +# }\n> > +# ]}\n> > +#\n> > ##\n> > { 'command': 'query-hotpluggable-cpus', 'returns': ['HotpluggableCPU'] } \n> \n> Please stick in '# Example:' like we do in query-hotpluggable-cpus's doc\n> comment. I expect the generated documentation to be illegible[*]\n> without it.\n\nShould '# Example:' go before each of the examples (instead of the\nbeginning of the example block), then?\n\n> \n> \n> [*] If you want to perform a quick eye-over, try running \"make\n> tests/qapi-schema/doc-good.test.txt\" and examine the result.\n\nHmm... I might be missing something in my setup:\n\n[cohuck@gondolin build]$ make tests/qapi-schema/doc-good.test.txt\n GEN tests/qapi-schema/doc-good.test.txt\ntests/qapi-schema/doc-good.test.texi:79: @subsection seen before @end deftp\ntests/qapi-schema/doc-good.test.texi:90: unmatched `@end deftp'\nmake: *** [Makefile:695: tests/qapi-schema/doc-good.test.txt] Error 1","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y6T354mWfz9s5L\n\tfor ;\n\tWed, 4 Oct 2017 19:05:04 +1100 (AEDT)","from localhost ([::1]:33606 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dzefu-0001o3-1w\n\tfor incoming@patchwork.ozlabs.org; Wed, 04 Oct 2017 04:05:02 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:38942)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dzefL-0001lk-HD\n\tfor qemu-devel@nongnu.org; Wed, 04 Oct 2017 04:04:33 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dzefI-0002JE-D8\n\tfor qemu-devel@nongnu.org; Wed, 04 Oct 2017 04:04:27 -0400","from mx1.redhat.com ([209.132.183.28]:52516)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dzefI-0002Fu-7q\n\tfor qemu-devel@nongnu.org; Wed, 04 Oct 2017 04:04:24 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 29CE2C059B7A;\n\tWed, 4 Oct 2017 08:04:22 +0000 (UTC)","from gondolin (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C9E3C5C881;\n\tWed, 4 Oct 2017 08:04:17 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 29CE2C059B7A","Date":"Wed, 4 Oct 2017 10:04:15 +0200","From":"Cornelia Huck ","To":"Markus Armbruster ","Message-ID":"<20171004100415.0f0ded10.cohuck@redhat.com>","In-Reply-To":"<87k20eq9em.fsf@dusky.pond.sub.org>","References":"<20170913132417.24384-1-david@redhat.com>\n\t<20170913132417.24384-19-david@redhat.com>\n\t<87k20eq9em.fsf@dusky.pond.sub.org>","Organization":"Red Hat GmbH","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tWed, 04 Oct 2017 08:04:22 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tEduardo Habkost ,\n\tDavid Hildenbrand ,\n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com, Paolo Bonzini ,\n\tIgor Mammedov ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1779774,"web_url":"http://patchwork.ozlabs.org/comment/1779774/","msgid":"<87k20bm6cw.fsf@dusky.pond.sub.org>","list_archive_url":null,"date":"2017-10-04T12:42:55","subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/","name":"Markus Armbruster","email":"armbru@redhat.com"},"content":"Cornelia Huck writes:\n\n> On Mon, 02 Oct 2017 09:46:41 +0200\n> Markus Armbruster wrote:\n>\n>> David Hildenbrand writes:\n>> \n>> > CPU hotplug is only possible on a per core basis on s390x. So let's\n>> > add possible_cpus and properly wire everything up.\n>> >\n>> > Signed-off-by: David Hildenbrand \n>> [...]\n>> > diff --git a/qapi-schema.json b/qapi-schema.json\n>> > index f3af2cb851..79e9f85404 100644\n>> > --- a/qapi-schema.json\n>> > +++ b/qapi-schema.json\n>> > @@ -3121,6 +3121,22 @@\n>> > # }\n>> > # ]}\n>> > #\n>> > +# For s390x-virtio-ccw machine type started with -smp 1,maxcpus=2 -cpu qemu\n>> > +# (Since: 2.11):\n>> > +#\n>> > +# -> { \"execute\": \"query-hotpluggable-cpus\" }\n>> > +# <- {\"return\": [\n>> > +# {\n>> > +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n>> > +# \"props\": { \"core-id\": 1 }\n>> > +# },\n>> > +# {\n>> > +# \"qom-path\": \"/machine/unattached/device[0]\",\n>> > +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n>> > +# \"props\": { \"core-id\": 0 }\n>> > +# }\n>> > +# ]}\n>> > +#\n>> > ##\n>> > { 'command': 'query-hotpluggable-cpus', 'returns': ['HotpluggableCPU'] } \n>> \n>> Please stick in '# Example:' like we do in query-hotpluggable-cpus's doc\n>> comment. I expect the generated documentation to be illegible[*]\n>> without it.\n>\n> Should '# Example:' go before each of the examples (instead of the\n> beginning of the example block), then?\n\nWhatever makes the generated documentation look better.\n\n>> [*] If you want to perform a quick eye-over, try running \"make\n>> tests/qapi-schema/doc-good.test.txt\" and examine the result.\n>\n> Hmm... I might be missing something in my setup:\n>\n> [cohuck@gondolin build]$ make tests/qapi-schema/doc-good.test.txt\n> GEN tests/qapi-schema/doc-good.test.txt\n> tests/qapi-schema/doc-good.test.texi:79: @subsection seen before @end deftp\n> tests/qapi-schema/doc-good.test.texi:90: unmatched `@end deftp'\n> make: *** [Makefile:695: tests/qapi-schema/doc-good.test.txt] Error 1\n\nPasto, sorry! Try \"make docs/interop/qemu-qmp-ref.txt\". .pdf and .html\nalso work.","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y6bDJ5RDjz9t16\n\tfor ;\n\tWed, 4 Oct 2017 23:43:28 +1100 (AEDT)","from localhost ([::1]:35039 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dzj1K-00079O-TX\n\tfor incoming@patchwork.ozlabs.org; Wed, 04 Oct 2017 08:43:26 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35715)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dzj0z-00079H-GX\n\tfor qemu-devel@nongnu.org; Wed, 04 Oct 2017 08:43:06 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dzj0v-0005sf-Jo\n\tfor qemu-devel@nongnu.org; Wed, 04 Oct 2017 08:43:05 -0400","from mx1.redhat.com ([209.132.183.28]:40834)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dzj0v-0005rf-AL\n\tfor qemu-devel@nongnu.org; Wed, 04 Oct 2017 08:43:01 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 20F68806A1;\n\tWed, 4 Oct 2017 12:43:00 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-91.ams2.redhat.com\n\t[10.36.116.91])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id C7991610B0;\n\tWed, 4 Oct 2017 12:42:56 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 35660113298A; Wed, 4 Oct 2017 14:42:55 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 20F68806A1","From":"Markus Armbruster ","To":"Cornelia Huck ","References":"<20170913132417.24384-1-david@redhat.com>\n\t<20170913132417.24384-19-david@redhat.com>\n\t<87k20eq9em.fsf@dusky.pond.sub.org>\n\t<20171004100415.0f0ded10.cohuck@redhat.com>","Date":"Wed, 04 Oct 2017 14:42:55 +0200","In-Reply-To":"<20171004100415.0f0ded10.cohuck@redhat.com> (Cornelia Huck's\n\tmessage of \"Wed, 4 Oct 2017 10:04:15 +0200\")","Message-ID":"<87k20bm6cw.fsf@dusky.pond.sub.org>","User-Agent":"Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)","MIME-Version":"1.0","Content-Type":"text/plain","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tWed, 04 Oct 2017 12:43:00 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tEduardo Habkost ,\n\tDavid Hildenbrand ,\n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com, Igor Mammedov ,\n\tPaolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1779802,"web_url":"http://patchwork.ozlabs.org/comment/1779802/","msgid":"<20171004150956.0901d6c1.cohuck@redhat.com>","list_archive_url":null,"date":"2017-10-04T13:09:56","subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/","name":"Cornelia Huck","email":"cohuck@redhat.com"},"content":"On Wed, 04 Oct 2017 14:42:55 +0200\nMarkus Armbruster wrote:\n\n> Cornelia Huck writes:\n> \n> > On Mon, 02 Oct 2017 09:46:41 +0200\n> > Markus Armbruster wrote:\n> > \n> >> David Hildenbrand writes:\n> >> \n> >> > CPU hotplug is only possible on a per core basis on s390x. So let's\n> >> > add possible_cpus and properly wire everything up.\n> >> >\n> >> > Signed-off-by: David Hildenbrand \n> >> [...] \n> >> > diff --git a/qapi-schema.json b/qapi-schema.json\n> >> > index f3af2cb851..79e9f85404 100644\n> >> > --- a/qapi-schema.json\n> >> > +++ b/qapi-schema.json\n> >> > @@ -3121,6 +3121,22 @@\n> >> > # }\n> >> > # ]}\n> >> > #\n> >> > +# For s390x-virtio-ccw machine type started with -smp 1,maxcpus=2 -cpu qemu\n> >> > +# (Since: 2.11):\n> >> > +#\n> >> > +# -> { \"execute\": \"query-hotpluggable-cpus\" }\n> >> > +# <- {\"return\": [\n> >> > +# {\n> >> > +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n> >> > +# \"props\": { \"core-id\": 1 }\n> >> > +# },\n> >> > +# {\n> >> > +# \"qom-path\": \"/machine/unattached/device[0]\",\n> >> > +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n> >> > +# \"props\": { \"core-id\": 0 }\n> >> > +# }\n> >> > +# ]}\n> >> > +#\n> >> > ##\n> >> > { 'command': 'query-hotpluggable-cpus', 'returns': ['HotpluggableCPU'] } \n> >> \n> >> Please stick in '# Example:' like we do in query-hotpluggable-cpus's doc\n> >> comment. I expect the generated documentation to be illegible[*]\n> >> without it. \n> >\n> > Should '# Example:' go before each of the examples (instead of the\n> > beginning of the example block), then? \n> \n> Whatever makes the generated documentation look better.\n\nThe pdf indeed looks ugly, but that's a preexisting problem, and adding\nmore '# Example:' lines does not really help.\n\nThe basic issue is that the code expects just one example and no\nadditional text for the '# Example:' tag -- the explaining text for the\nvarious statements ends up looking like the qmp examples. That should\nbe improved before doing a patch on top for this command (and I don't\nreally have the skills or time to improve the output, sorry.)","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y6bqg38Jlz9t2h\n\tfor ;\n\tThu, 5 Oct 2017 00:10:39 +1100 (AEDT)","from localhost ([::1]:35158 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dzjRd-00035n-Iy\n\tfor incoming@patchwork.ozlabs.org; Wed, 04 Oct 2017 09:10:37 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43226)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dzjRC-0002yj-0l\n\tfor qemu-devel@nongnu.org; Wed, 04 Oct 2017 09:10:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dzjR7-0008Vg-TQ\n\tfor qemu-devel@nongnu.org; Wed, 04 Oct 2017 09:10:09 -0400","from mx1.redhat.com ([209.132.183.28]:36028)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dzjR7-0008Up-KM\n\tfor qemu-devel@nongnu.org; Wed, 04 Oct 2017 09:10:05 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id B1D47C059B7A;\n\tWed, 4 Oct 2017 13:10:04 +0000 (UTC)","from gondolin (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 319635D9CB;\n\tWed, 4 Oct 2017 13:09:59 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B1D47C059B7A","Date":"Wed, 4 Oct 2017 15:09:56 +0200","From":"Cornelia Huck ","To":"Markus Armbruster ","Message-ID":"<20171004150956.0901d6c1.cohuck@redhat.com>","In-Reply-To":"<87k20bm6cw.fsf@dusky.pond.sub.org>","References":"<20170913132417.24384-1-david@redhat.com>\n\t<20170913132417.24384-19-david@redhat.com>\n\t<87k20eq9em.fsf@dusky.pond.sub.org>\n\t<20171004100415.0f0ded10.cohuck@redhat.com>\n\t<87k20bm6cw.fsf@dusky.pond.sub.org>","Organization":"Red Hat GmbH","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tWed, 04 Oct 2017 13:10:04 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tEduardo Habkost ,\n\tDavid Hildenbrand ,\n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com, Igor Mammedov ,\n\tPaolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1781813,"web_url":"http://patchwork.ozlabs.org/comment/1781813/","msgid":"<87wp48xkkf.fsf@dusky.pond.sub.org>","list_archive_url":null,"date":"2017-10-06T17:17:20","subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/","name":"Markus Armbruster","email":"armbru@redhat.com"},"content":"Cornelia Huck writes:\n\n> On Wed, 04 Oct 2017 14:42:55 +0200\n> Markus Armbruster wrote:\n>\n>> Cornelia Huck writes:\n>> \n>> > On Mon, 02 Oct 2017 09:46:41 +0200\n>> > Markus Armbruster wrote:\n>> > \n>> >> David Hildenbrand writes:\n>> >> \n>> >> > CPU hotplug is only possible on a per core basis on s390x. So let's\n>> >> > add possible_cpus and properly wire everything up.\n>> >> >\n>> >> > Signed-off-by: David Hildenbrand \n>> >> [...] \n>> >> > diff --git a/qapi-schema.json b/qapi-schema.json\n>> >> > index f3af2cb851..79e9f85404 100644\n>> >> > --- a/qapi-schema.json\n>> >> > +++ b/qapi-schema.json\n>> >> > @@ -3121,6 +3121,22 @@\n>> >> > # }\n>> >> > # ]}\n>> >> > #\n>> >> > +# For s390x-virtio-ccw machine type started with -smp 1,maxcpus=2 -cpu qemu\n>> >> > +# (Since: 2.11):\n>> >> > +#\n>> >> > +# -> { \"execute\": \"query-hotpluggable-cpus\" }\n>> >> > +# <- {\"return\": [\n>> >> > +# {\n>> >> > +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n>> >> > +# \"props\": { \"core-id\": 1 }\n>> >> > +# },\n>> >> > +# {\n>> >> > +# \"qom-path\": \"/machine/unattached/device[0]\",\n>> >> > +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n>> >> > +# \"props\": { \"core-id\": 0 }\n>> >> > +# }\n>> >> > +# ]}\n>> >> > +#\n>> >> > ##\n>> >> > { 'command': 'query-hotpluggable-cpus', 'returns': ['HotpluggableCPU'] } \n>> >> \n>> >> Please stick in '# Example:' like we do in query-hotpluggable-cpus's doc\n>> >> comment. I expect the generated documentation to be illegible[*]\n>> >> without it. \n>> >\n>> > Should '# Example:' go before each of the examples (instead of the\n>> > beginning of the example block), then? \n>> \n>> Whatever makes the generated documentation look better.\n>\n> The pdf indeed looks ugly, but that's a preexisting problem, and adding\n> more '# Example:' lines does not really help.\n>\n> The basic issue is that the code expects just one example and no\n> additional text for the '# Example:' tag -- the explaining text for the\n> various statements ends up looking like the qmp examples. That should\n> be improved before doing a patch on top for this command (and I don't\n> really have the skills or time to improve the output, sorry.)\n\nMarc-André, any ideas?","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y7xD46VSBz9t3C\n\tfor ;\n\tSat, 7 Oct 2017 04:17:55 +1100 (AEDT)","from localhost ([::1]:46198 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1e0WG0-0004A9-Rr\n\tfor incoming@patchwork.ozlabs.org; Fri, 06 Oct 2017 13:17:52 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57191)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1e0WFf-0004A3-7q\n\tfor qemu-devel@nongnu.org; Fri, 06 Oct 2017 13:17:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1e0WFb-0004rY-V0\n\tfor qemu-devel@nongnu.org; Fri, 06 Oct 2017 13:17:31 -0400","from mx1.redhat.com ([209.132.183.28]:42536)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1e0WFb-0004qM-M3\n\tfor qemu-devel@nongnu.org; Fri, 06 Oct 2017 13:17:27 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 01B038210D;\n\tFri, 6 Oct 2017 17:17:26 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-91.ams2.redhat.com\n\t[10.36.116.91])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 095F85D963;\n\tFri, 6 Oct 2017 17:17:22 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 6D79A113298A; Fri, 6 Oct 2017 19:17:20 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 01B038210D","From":"Markus Armbruster ","To":"Cornelia Huck ","References":"<20170913132417.24384-1-david@redhat.com>\n\t<20170913132417.24384-19-david@redhat.com>\n\t<87k20eq9em.fsf@dusky.pond.sub.org>\n\t<20171004100415.0f0ded10.cohuck@redhat.com>\n\t<87k20bm6cw.fsf@dusky.pond.sub.org>\n\t<20171004150956.0901d6c1.cohuck@redhat.com>","Date":"Fri, 06 Oct 2017 19:17:20 +0200","In-Reply-To":"<20171004150956.0901d6c1.cohuck@redhat.com> (Cornelia Huck's\n\tmessage of \"Wed, 4 Oct 2017 15:09:56 +0200\")","Message-ID":"<87wp48xkkf.fsf@dusky.pond.sub.org>","User-Agent":"Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"quoted-printable","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tFri, 06 Oct 2017 17:17:26 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com, Eduardo\n\tHabkost , =?utf-8?q?Marc-Andr=C3=A9_Lureau?=\n\t, \tDavid Hildenbrand ,\n\tRichard Henderson , qemu-devel@nongnu.org,\n\tAlexander Graf , borntraeger@de.ibm.com,\n\tPaolo Bonzini , Igor Mammedov ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1782692,"web_url":"http://patchwork.ozlabs.org/comment/1782692/","msgid":"<1138849410.27888094.1507545077979.JavaMail.zimbra@redhat.com>","list_archive_url":null,"date":"2017-10-09T10:31:17","subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"content":"Hi\n\n----- Original Message -----\n> Cornelia Huck writes:\n> \n> > On Wed, 04 Oct 2017 14:42:55 +0200\n> > Markus Armbruster wrote:\n> >\n> >> Cornelia Huck writes:\n> >> \n> >> > On Mon, 02 Oct 2017 09:46:41 +0200\n> >> > Markus Armbruster wrote:\n> >> > \n> >> >> David Hildenbrand writes:\n> >> >> \n> >> >> > CPU hotplug is only possible on a per core basis on s390x. So let's\n> >> >> > add possible_cpus and properly wire everything up.\n> >> >> >\n> >> >> > Signed-off-by: David Hildenbrand \n> >> >> [...]\n> >> >> > diff --git a/qapi-schema.json b/qapi-schema.json\n> >> >> > index f3af2cb851..79e9f85404 100644\n> >> >> > --- a/qapi-schema.json\n> >> >> > +++ b/qapi-schema.json\n> >> >> > @@ -3121,6 +3121,22 @@\n> >> >> > # }\n> >> >> > # ]}\n> >> >> > #\n> >> >> > +# For s390x-virtio-ccw machine type started with -smp 1,maxcpus=2\n> >> >> > -cpu qemu\n> >> >> > +# (Since: 2.11):\n> >> >> > +#\n> >> >> > +# -> { \"execute\": \"query-hotpluggable-cpus\" }\n> >> >> > +# <- {\"return\": [\n> >> >> > +# {\n> >> >> > +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n> >> >> > +# \"props\": { \"core-id\": 1 }\n> >> >> > +# },\n> >> >> > +# {\n> >> >> > +# \"qom-path\": \"/machine/unattached/device[0]\",\n> >> >> > +# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n> >> >> > +# \"props\": { \"core-id\": 0 }\n> >> >> > +# }\n> >> >> > +# ]}\n> >> >> > +#\n> >> >> > ##\n> >> >> > { 'command': 'query-hotpluggable-cpus', 'returns':\n> >> >> > ['HotpluggableCPU'] }\n> >> >> \n> >> >> Please stick in '# Example:' like we do in query-hotpluggable-cpus's\n> >> >> doc\n> >> >> comment. I expect the generated documentation to be illegible[*]\n> >> >> without it.\n> >> >\n> >> > Should '# Example:' go before each of the examples (instead of the\n> >> > beginning of the example block), then?\n> >> \n> >> Whatever makes the generated documentation look better.\n> >\n> > The pdf indeed looks ugly, but that's a preexisting problem, and adding\n> > more '# Example:' lines does not really help.\n> >\n> > The basic issue is that the code expects just one example and no\n> > additional text for the '# Example:' tag -- the explaining text for the\n> > various statements ends up looking like the qmp examples. That should\n> > be improved before doing a patch on top for this command (and I don't\n> > really have the skills or time to improve the output, sorry.)\n> \n> Marc-André, any ideas?\n> \n\nIt's not supported atm. The ideas to fix this are pretty much a matter of taste.\n\nI'd suggest to keep the code below the Example: section as @example/verbatim by default. And introduce a new section syntax, like Example:: to do \"manual\" formatting.\n\nExample::\n\nThis text would be in regular format.\n1. and allow list, *strong* etc.\n\n| -> { then have some code }\n| <- ...\n\nAnd regulat text again.","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mlureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y9c4N6M7xz9tXx\n\tfor ;\n\tMon, 9 Oct 2017 21:32:03 +1100 (AEDT)","from localhost ([::1]:57025 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1e1VLr-0005V7-IC\n\tfor incoming@patchwork.ozlabs.org; Mon, 09 Oct 2017 06:31:59 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:45748)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1e1VLO-0005Uy-Mh\n\tfor qemu-devel@nongnu.org; Mon, 09 Oct 2017 06:31:31 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1e1VLI-0005wm-OP\n\tfor qemu-devel@nongnu.org; Mon, 09 Oct 2017 06:31:30 -0400","from mx1.redhat.com ([209.132.183.28]:37272)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1e1VLI-0005vM-Eo\n\tfor qemu-devel@nongnu.org; Mon, 09 Oct 2017 06:31:24 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 07F62FF4C;\n\tMon, 9 Oct 2017 10:31:22 +0000 (UTC)","from colo-mx.corp.redhat.com\n\t(colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 9288F6E506;\n\tMon, 9 Oct 2017 10:31:18 +0000 (UTC)","from zmail17.collab.prod.int.phx2.redhat.com\n\t(zmail17.collab.prod.int.phx2.redhat.com [10.5.83.19])\n\tby colo-mx.corp.redhat.com (Postfix) with ESMTP id 655DF1808874;\n\tMon, 9 Oct 2017 10:31:18 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 07F62FF4C","Date":"Mon, 9 Oct 2017 06:31:17 -0400 (EDT)","From":"=?utf-8?q?Marc-Andr=C3=A9?= Lureau ","To":"Markus Armbruster ","Message-ID":"<1138849410.27888094.1507545077979.JavaMail.zimbra@redhat.com>","In-Reply-To":"<87wp48xkkf.fsf@dusky.pond.sub.org>","References":"<20170913132417.24384-1-david@redhat.com>\n\t<20170913132417.24384-19-david@redhat.com>\n\t<87k20eq9em.fsf@dusky.pond.sub.org>\n\t<20171004100415.0f0ded10.cohuck@redhat.com>\n\t<87k20bm6cw.fsf@dusky.pond.sub.org>\n\t<20171004150956.0901d6c1.cohuck@redhat.com>\n\t<87wp48xkkf.fsf@dusky.pond.sub.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"quoted-printable","X-Originating-IP":"[10.36.112.63, 10.4.195.24]","Thread-Topic":"s390x: implement query-hotpluggable-cpus","Thread-Index":"iRDpRCn049IxamCubx62Vz+ZpN0j2g==","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tMon, 09 Oct 2017 10:31:22 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement\n\tquery-hotpluggable-cpus","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tEduardo Habkost ,\n\tDavid Hildenbrand , Cornelia Huck , \n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com, Paolo Bonzini ,\n\tIgor Mammedov ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]