From: Cornelia Huck <cohuck@redhat.com>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, rth@twiddle.net, agraf@suse.de,
thuth@redhat.com, borntraeger@de.ibm.com, david@redhat.com,
Cornelia Huck <cohuck@redhat.com>
Subject: [Qemu-devel] [PULL v2 28/38] s390x: implement query-hotpluggable-cpus
Date: Tue, 19 Sep 2017 18:43:27 +0200 [thread overview]
Message-ID: <20170919164337.18555-29-cohuck@redhat.com> (raw)
In-Reply-To: <20170919164337.18555-1-cohuck@redhat.com>
From: David Hildenbrand <david@redhat.com>
CPU hotplug is only possible on a per core basis on s390x. So let's
add possible_cpus and wire everything up properly.
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170913132417.24384-19-david@redhat.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 41 +++++++++++++++++++++++++++++++++++++++++
qapi-schema.json | 16 ++++++++++++++++
2 files changed, 57 insertions(+)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index acdd53573c..b7b2b7ebcd 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -50,6 +50,7 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
static void s390_init_cpus(MachineState *machine)
{
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
int i;
gchar *name;
@@ -74,6 +75,9 @@ static void s390_init_cpus(MachineState *machine)
g_free(name);
}
+ /* initialize possible_cpus */
+ mc->possible_cpu_arch_ids(machine);
+
for (i = 0; i < smp_cpus; i++) {
s390x_new_cpu(machine->cpu_model, i, &error_fatal);
}
@@ -309,6 +313,7 @@ static void s390_cpu_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
gchar *name;
+ MachineState *ms = MACHINE(hotplug_dev);
S390CPU *cpu = S390_CPU(dev);
CPUState *cs = CPU(dev);
@@ -316,6 +321,9 @@ static void s390_cpu_plug(HotplugHandler *hotplug_dev,
object_property_set_link(OBJECT(hotplug_dev), OBJECT(cs), name,
errp);
g_free(name);
+
+ g_assert(!ms->possible_cpus->cpus[cpu->env.core_id].cpu);
+ ms->possible_cpus->cpus[cpu->env.core_id].cpu = OBJECT(dev);
}
static void s390_machine_reset(void)
@@ -348,6 +356,36 @@ static void s390_machine_device_unplug_request(HotplugHandler *hotplug_dev,
}
}
+static CpuInstanceProperties s390_cpu_index_to_props(MachineState *machine,
+ unsigned cpu_index)
+{
+ g_assert(machine->possible_cpus && cpu_index < machine->possible_cpus->len);
+
+ return machine->possible_cpus->cpus[cpu_index].props;
+}
+
+static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms)
+{
+ int i;
+
+ if (ms->possible_cpus) {
+ g_assert(ms->possible_cpus && ms->possible_cpus->len == max_cpus);
+ return ms->possible_cpus;
+ }
+
+ ms->possible_cpus = g_malloc0(sizeof(CPUArchIdList) +
+ sizeof(CPUArchId) * max_cpus);
+ ms->possible_cpus->len = max_cpus;
+ for (i = 0; i < ms->possible_cpus->len; i++) {
+ ms->possible_cpus->cpus[i].vcpus_count = 1;
+ ms->possible_cpus->cpus[i].arch_id = i;
+ ms->possible_cpus->cpus[i].props.has_core_id = true;
+ ms->possible_cpus->cpus[i].props.core_id = i;
+ }
+
+ return ms->possible_cpus;
+}
+
static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,
DeviceState *dev)
{
@@ -395,7 +433,10 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)
mc->no_sdcard = 1;
mc->use_sclp = 1;
mc->max_cpus = 248;
+ mc->has_hotpluggable_cpus = true;
mc->get_hotplug_handler = s390_get_hotplug_handler;
+ mc->cpu_index_to_instance_props = s390_cpu_index_to_props;
+ mc->possible_cpu_arch_ids = s390_possible_cpu_arch_ids;
hc->plug = s390_machine_device_plug;
hc->unplug_request = s390_machine_device_unplug_request;
nc->nmi_monitor_handler = s390_nmi;
diff --git a/qapi-schema.json b/qapi-schema.json
index cdff39a456..a3ba1c9a1c 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3153,6 +3153,22 @@
# }
# ]}
#
+# For s390x-virtio-ccw machine type started with -smp 1,maxcpus=2 -cpu qemu
+# (Since: 2.11):
+#
+# -> { "execute": "query-hotpluggable-cpus" }
+# <- {"return": [
+# {
+# "type": "qemu-s390-cpu", "vcpus-count": 1,
+# "props": { "core-id": 1 }
+# },
+# {
+# "qom-path": "/machine/unattached/device[0]",
+# "type": "qemu-s390-cpu", "vcpus-count": 1,
+# "props": { "core-id": 0 }
+# }
+# ]}
+#
##
{ 'command': 'query-hotpluggable-cpus', 'returns': ['HotpluggableCPU'] }
--
2.13.5
next prev parent reply other threads:[~2017-09-19 16:46 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-19 16:42 [Qemu-devel] [PULL v2 00/38] various s390x patches (+some fixes) Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 01/38] s390x/css: fix cc handling for XSCH Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 02/38] tests: Enable the drive_del test also on s390x Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 03/38] s390x/pci: remove idx from msix msg data Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 04/38] s390x/pci: fixup ind_offset of msix routing entry Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 05/38] s390x/pci: add iommu replay callback Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 06/38] hw/misc/ivshmem: Fix ivshmem_recv_msg() to also work on big endian systems Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 07/38] s390x/css: drop data-check in interpretation Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 08/38] s390x/css: fix NULL handling for CCW addresses Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 09/38] s390x/css: remove unused error handling branch Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 10/38] s390: set DHCP client architecure id for netboot Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 11/38] exec, dump, i386, ppc, s390x: don't include exec/cpu-all.h explicitly Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 12/38] cpu: drop old comments describing members Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 13/38] s390x: get rid of s390-virtio.c Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 14/38] s390x: rename s390-virtio.h to s390-virtio-hcall.h Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 15/38] s390x: move s390_virtio_hypercall() " Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 16/38] s390x: move subsystem_reset() to s390-virtio-ccw.h Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 17/38] target/s390x: move some s390x typedefs to cpu-qom.h Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 18/38] s390x: move sclp_service_call() to sclp.h Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 19/38] target/s390x: use trigger_pgm_exception() in s390_cpu_handle_mmu_fault() Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 20/38] target/s390x: use program_interrupt() in per_check_exception() Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 21/38] s390x: allow only 1 CPU with TCG Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 22/38] target/s390x: set cpu->id for linux user when realizing Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 23/38] target/s390x: use "core-id" for cpu number/address/id handling Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 24/38] target/s390x: rename next_cpu_id to next_core_id Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 25/38] s390x: print CPU definitions in sorted order Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 26/38] s390x: allow cpu hotplug via device_add Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 27/38] s390x: CPU hot unplug via device_del cannot work for now Cornelia Huck
2017-09-19 16:43 ` Cornelia Huck [this message]
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 29/38] s390x: get rid of cpu_states and use possible_cpus instead Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 30/38] s390x: get rid of cpu_s390x_create() Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 31/38] s390x: generate sclp cpu information from possible_cpus Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 32/38] s390x: allow CPU hotplug in random core-id order Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 33/38] virtio-ccw: remove stale comments on endianness Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 34/38] configure: Allow --enable-seccomp on s390x, too Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 35/38] s390x/ccw: create s390 phb for compat reasons as well Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 36/38] virtio-gpu: Handle endian conversion Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 37/38] virtio-ccw: Create a virtio gpu device for the ccw bus Cornelia Huck
2017-09-19 16:43 ` [Qemu-devel] [PULL v2 38/38] MAINTAINERS/s390x: add terminal3270.c Cornelia Huck
2017-09-19 17:03 ` [Qemu-devel] [PULL v2 00/38] various s390x patches (+some fixes) Christian Borntraeger
2017-09-20 7:20 ` Cornelia Huck
2017-09-19 18:23 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170919164337.18555-29-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=agraf@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=david@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).