[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.6 05/11] s390x/cpu: Add CPU property links
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL for-2.6 05/11] s390x/cpu: Add CPU property links |
Date: |
Fri, 11 Mar 2016 10:56:36 +0100 |
From: Matthew Rosato <address@hidden>
Link each CPUState as property machine/cpu[n] during initialization.
Add a hotplug handler to s390-virtio-ccw machine and set the
state during plug.
Signed-off-by: Matthew Rosato <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 34 ++++++++++++++++++++++++++++++++++
hw/s390x/s390-virtio.c | 17 ++++++++++++-----
2 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index b05ed8b..7fc1879 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -156,10 +156,41 @@ static void ccw_init(MachineState *machine)
gtod_save, gtod_load, kvm_state);
}
+static void s390_cpu_plug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ gchar *name;
+ S390CPU *cpu = S390_CPU(dev);
+ CPUState *cs = CPU(dev);
+
+ name = g_strdup_printf("cpu[%i]", cpu->env.cpu_num);
+ object_property_set_link(OBJECT(hotplug_dev), OBJECT(cs), name,
+ errp);
+ g_free(name);
+}
+
+static void s390_machine_device_plug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+ s390_cpu_plug(hotplug_dev, dev, errp);
+ }
+}
+
+static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,
+ DeviceState *dev)
+{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+ return HOTPLUG_HANDLER(machine);
+ }
+ return NULL;
+}
+
static void ccw_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
NMIClass *nc = NMI_CLASS(oc);
+ HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
mc->init = ccw_init;
mc->reset = s390_machine_reset;
@@ -171,6 +202,8 @@ static void ccw_machine_class_init(ObjectClass *oc, void
*data)
mc->no_sdcard = 1;
mc->use_sclp = 1;
mc->max_cpus = 255;
+ mc->get_hotplug_handler = s390_get_hotplug_handler;
+ hc->plug = s390_machine_device_plug;
nc->nmi_monitor_handler = s390_nmi;
}
@@ -232,6 +265,7 @@ static const TypeInfo ccw_machine_info = {
.class_init = ccw_machine_class_init,
.interfaces = (InterfaceInfo[]) {
{ TYPE_NMI },
+ { TYPE_HOTPLUG_HANDLER},
{ }
},
};
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index 57c3c88..f00d6b4 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -97,6 +97,7 @@ void s390_init_ipl_dev(const char *kernel_filename,
void s390_init_cpus(MachineState *machine)
{
int i;
+ gchar *name;
if (machine->cpu_model == NULL) {
machine->cpu_model = "host";
@@ -104,12 +105,18 @@ void s390_init_cpus(MachineState *machine)
cpu_states = g_malloc0(sizeof(S390CPU *) * max_cpus);
- for (i = 0; i < smp_cpus; i++) {
- S390CPU *cpu;
-
- cpu = cpu_s390x_init(machine->cpu_model);
+ for (i = 0; i < max_cpus; i++) {
+ name = g_strdup_printf("cpu[%i]", i);
+ object_property_add_link(OBJECT(machine), name, TYPE_S390_CPU,
+ (Object **) &cpu_states[i],
+ object_property_allow_set_link,
+ OBJ_PROP_LINK_UNREF_ON_RELEASE,
+ &error_abort);
+ g_free(name);
+ }
- cpu_states[i] = cpu;
+ for (i = 0; i < smp_cpus; i++) {
+ cpu_s390x_init(machine->cpu_model);
}
}
--
2.7.2
- [Qemu-devel] [PULL for-2.6 00/11] s390x patches for 2.6, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 06/11] s390x/cpu: Add error handling to cpu creation, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 01/11] s390x/cpu: Cleanup init in preparation for hotplug, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 02/11] s390x/cpu: Set initial CPU state in common routine, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 05/11] s390x/cpu: Add CPU property links,
Cornelia Huck <=
- [Qemu-devel] [PULL for-2.6 03/11] s390x/cpu: Get rid of side effects when creating a vcpu, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 08/11] pc-bios/s390-ccw: fix old bug in ptr increment, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 04/11] s390x/cpu: Tolerate max_cpus, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 09/11] s390x: Introduce machine definition macros, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 07/11] s390x/cpu: Allow hotplug of CPUs, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 11/11] s390x/cpu: use g_new0, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 10/11] s390x: Introduce S390MachineClass, Cornelia Huck, 2016/03/11
- Re: [Qemu-devel] [PULL for-2.6 00/11] s390x patches for 2.6, Peter Maydell, 2016/03/14