diff options
| author | David Hildenbrand <david@redhat.com> | 2017-09-13 15:24:06 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-09-19 18:31:31 +0200 |
| commit | b5684cd8c688337120eeba1654eba7e5863f04f6 (patch) | |
| tree | 67b104675046ba97010da4ab765e7a258a0fd287 /hw/s390x | |
| parent | e0b1a8a14e6bfcd66e1c20d6711f92ac86861e6b (diff) | |
| download | qemu-b5684cd8c688337120eeba1654eba7e5863f04f6.zip qemu-b5684cd8c688337120eeba1654eba7e5863f04f6.tar.gz qemu-b5684cd8c688337120eeba1654eba7e5863f04f6.tar.bz2 | |
s390x: allow only 1 CPU with TCG
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.
Tested-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170913132417.24384-12-david@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index c908f63..56f8200 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" @@ -55,6 +56,11 @@ static void s390_init_cpus(MachineState *machine) if (machine->cpu_model == NULL) { machine->cpu_model = s390_default_cpu_model_name(); } + 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); + } cpu_states = g_new0(S390CPU *, max_cpus); |