[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 11/21] s390x: allow only 1 CPU with TCG
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v4 11/21] s390x: allow only 1 CPU with TCG |
Date: |
Mon, 11 Sep 2017 17:21:40 +0200 |
Specifying more than 1 CPU (e.g. -smp 5) leads to SIGP errors (the
guest tries to bring these CPUs up but fails), because we don't support
multiple CPUs on s390x under TCG.
Let's bail out if more than 1 is specified, so we don't raise people's
hope. Make it a define, so we can easily bump it up later.
Tested-by: Matthew Rosato <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index f67b4b5d58..f1198b2745 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -23,6 +23,7 @@
#include "hw/s390x/css.h"
#include "virtio-ccw.h"
#include "qemu/config-file.h"
+#include "qemu/error-report.h"
#include "s390-pci-bus.h"
#include "hw/s390x/storage-keys.h"
#include "hw/s390x/storage-attributes.h"
@@ -47,6 +48,8 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
return cpu_states[cpu_addr];
}
+/* #define S390_TCG_SMP_SUPPORT */
+
static void s390_init_cpus(MachineState *machine)
{
int i;
@@ -55,6 +58,13 @@ static void s390_init_cpus(MachineState *machine)
if (machine->cpu_model == NULL) {
machine->cpu_model = s390_default_cpu_model_name();
}
+#ifndef S390_TCG_SMP_SUPPORT
+ if (tcg_enabled() && max_cpus > 1) {
+ error_report("Number of SMP CPUs requested (%d) exceeds max CPUs "
+ "supported by TCG (1) on s390x", max_cpus);
+ exit(1);
+ }
+#endif
cpu_states = g_new0(S390CPU *, max_cpus);
--
2.13.5
- [Qemu-devel] [PATCH v4 01/21] exec, dump, i386, ppc, s390x: don't include exec/cpu-all.h explicitly, (continued)
- [Qemu-devel] [PATCH v4 01/21] exec, dump, i386, ppc, s390x: don't include exec/cpu-all.h explicitly, David Hildenbrand, 2017/09/11
- [Qemu-devel] [PATCH v4 02/21] cpu: drop old comments describing members, David Hildenbrand, 2017/09/11
- [Qemu-devel] [PATCH v4 03/21] s390x: get rid of s390-virtio.c, David Hildenbrand, 2017/09/11
- [Qemu-devel] [PATCH v4 04/21] s390x: rename s390-virtio.h to s390-virtio-hcall.h, David Hildenbrand, 2017/09/11
- [Qemu-devel] [PATCH v4 05/21] s390x: move s390_virtio_hypercall() to s390-virtio-hcall.h, David Hildenbrand, 2017/09/11
- [Qemu-devel] [PATCH v4 06/21] s390x: move subsystem_reset() to s390-virtio-ccw.h, David Hildenbrand, 2017/09/11
- [Qemu-devel] [PATCH v4 07/21] target/s390x: move some s390x typedefs to cpu-qom.h, David Hildenbrand, 2017/09/11
- [Qemu-devel] [PATCH v4 08/21] s390x: move sclp_service_call() to sclp.h, David Hildenbrand, 2017/09/11
- [Qemu-devel] [PATCH v4 10/21] target/s390x: use program_interrupt() in per_check_exception(), David Hildenbrand, 2017/09/11
- [Qemu-devel] [PATCH v4 09/21] target/s390x: use trigger_pgm_exception() in s390_cpu_handle_mmu_fault(), David Hildenbrand, 2017/09/11
- [Qemu-devel] [PATCH v4 11/21] s390x: allow only 1 CPU with TCG,
David Hildenbrand <=
[Qemu-devel] [PATCH v4 12/21] target/s390x: set cpu->id for linux user when realizing, David Hildenbrand, 2017/09/11
[Qemu-devel] [PATCH v4 13/21] target/s390x: use "core-id" for cpu number/address/id handling, David Hildenbrand, 2017/09/11