[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 2/5] s390x: raise CPU hotplug irq after really ho
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v1 2/5] s390x: raise CPU hotplug irq after really hotplugged |
Date: |
Thu, 28 Sep 2017 15:46:06 +0200 |
Let's move it into the machine, so we trigger the IRQ after setting
ms->possible_cpus (which SCLP uses to construct the list of
online CPUs).
This also fixes a problem reported by Thomas Huth, whereby qemu can be
crashed using the none machine
qemu-s390x-softmmu -M none -monitor stdio
-> device_add qemu-s390-cpu
Reviewed-by: Christian Borntraeger <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 4 ++++
target/s390x/cpu.c | 8 --------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 1bcb7000ab..ab234247f6 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -305,6 +305,10 @@ static void s390_cpu_plug(HotplugHandler *hotplug_dev,
g_assert(!ms->possible_cpus->cpus[cpu->env.core_id].cpu);
ms->possible_cpus->cpus[cpu->env.core_id].cpu = OBJECT(dev);
+
+ if (dev->hotplugged) {
+ raise_irq_cpu_hotplug();
+ }
}
static void s390_machine_reset(void)
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 34538c3ab9..4920da3625 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -41,7 +41,6 @@
#include "hw/hw.h"
#include "sysemu/arch_init.h"
#include "sysemu/sysemu.h"
-#include "hw/s390x/sclp.h"
#endif
#define CR0_RESET 0xE0UL
@@ -227,13 +226,6 @@ static void s390_cpu_realizefn(DeviceState *dev, Error
**errp)
#endif
scc->parent_realize(dev, &err);
-
-#if !defined(CONFIG_USER_ONLY)
- if (dev->hotplugged) {
- raise_irq_cpu_hotplug();
- }
-#endif
-
out:
error_propagate(errp, err);
}
--
2.13.5
- [Qemu-devel] [PATCH v1 0/5] s390x: CPU related cleanups and one fix, David Hildenbrand, 2017/09/28
- [Qemu-devel] [PATCH v1 1/5] MAINTAINERS: use KVM s390x maintainers for kvm-stubs.c and kvm_s390x.h, David Hildenbrand, 2017/09/28
- [Qemu-devel] [PATCH v1 2/5] s390x: raise CPU hotplug irq after really hotplugged,
David Hildenbrand <=
- [Qemu-devel] [PATCH v1 3/5] s390x/cpumodel: fix max STFL(E) bit number, David Hildenbrand, 2017/09/28
- [Qemu-devel] [PATCH v1 5/5] s390x: introduce and use S390_MAX_CPUS, David Hildenbrand, 2017/09/28
- [Qemu-devel] [PATCH v1 4/5] target/s390x: get rid of next_core_id, David Hildenbrand, 2017/09/28
- Re: [Qemu-devel] [PATCH v1 0/5] s390x: CPU related cleanups and one fix, Cornelia Huck, 2017/09/29