{"id":813454,"url":"http://patchwork.ozlabs.org/api/patches/813454/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913132417.24384-19-david@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170913132417.24384-19-david@redhat.com>","list_archive_url":null,"date":"2017-09-13T13:24:13","name":"[v5,18/22] s390x: implement query-hotpluggable-cpus","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3594d3109ea8b40986ad2e3c1f2f4d5636e33600","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913132417.24384-19-david@redhat.com/mbox/","series":[{"id":2916,"url":"http://patchwork.ozlabs.org/api/series/2916/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2916","date":"2017-09-13T13:23:55","name":"s390x cleanups and CPU hotplug via device_add","version":5,"mbox":"http://patchwork.ozlabs.org/series/2916/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813454/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813454/checks/","tags":{},"related":[],"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=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 3xsjZy6y6zz9s78\n\tfor ;\n\tWed, 13 Sep 2017 23:44:58 +1000 (AEST)","from localhost ([::1]:42614 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds7yL-0000d2-56\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 09:44:57 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:39503)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds7fs-00062m-Cr\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 09:25:55 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds7fr-0003R8-BV\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 09:25:52 -0400","from mx1.redhat.com ([209.132.183.28]:52704)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1ds7fr-0003Qt-30\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 09:25:51 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 235E9C058EAE;\n\tWed, 13 Sep 2017 13:25:50 +0000 (UTC)","from t460s.redhat.com (ovpn-116-21.ams2.redhat.com [10.36.116.21])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 67E645C6D2;\n\tWed, 13 Sep 2017 13:25:46 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 235E9C058EAE","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 15:24:13 +0200","Message-Id":"<20170913132417.24384-19-david@redhat.com>","In-Reply-To":"<20170913132417.24384-1-david@redhat.com>","References":"<20170913132417.24384-1-david@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tWed, 13 Sep 2017 13:25:50 +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":"[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 , david@redhat.com,\n\tcohuck@redhat.com, Richard Henderson ,\n\tAlexander Graf ,\n\tMarkus Armbruster , borntraeger@de.ibm.com,\n\tIgor Mammedov , Paolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"CPU hotplug is only possible on a per core basis on s390x. So let's\nadd possible_cpus and properly wire everything up.\n\nSigned-off-by: David Hildenbrand \n---\n hw/s390x/s390-virtio-ccw.c | 41 +++++++++++++++++++++++++++++++++++++++++\n qapi-schema.json | 16 ++++++++++++++++\n 2 files changed, 57 insertions(+)","diff":"diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 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;\ndiff --git a/qapi-schema.json b/qapi-schema.json\nindex 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","prefixes":["v5","18/22"]}