diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2020-09-11 09:32:02 -0400 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2020-09-22 16:45:16 -0400 |
| commit | c4332cd1dcf2964c23893ab4c0bf8d774e42a3cf (patch) | |
| tree | d6fa4448519403122dbc5c34e371246de2e39e27 /hw/i386 | |
| parent | efba15959cdb1ca7beeed8d6188ab0905b468f90 (diff) | |
| download | qemu-c4332cd1dcf2964c23893ab4c0bf8d774e42a3cf.zip qemu-c4332cd1dcf2964c23893ab4c0bf8d774e42a3cf.tar.gz qemu-c4332cd1dcf2964c23893ab4c0bf8d774e42a3cf.tar.bz2 | |
smp: drop support for deprecated (invalid topologies)
it's was deprecated since 3.1
Support for invalid topologies is removed, the user must ensure
that topologies described with -smp include all possible cpus,
i.e. (sockets * cores * threads) == maxcpus or QEMU will
exit with error.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20200911133202.938754-1-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b553693..1e2ab5e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -746,23 +746,15 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts) exit(1); } - if (sockets * dies * cores * threads > ms->smp.max_cpus) { - error_report("cpu topology: " - "sockets (%u) * dies (%u) * cores (%u) * threads (%u) > " - "maxcpus (%u)", + if (sockets * dies * cores * threads != ms->smp.max_cpus) { + error_report("Invalid CPU topology deprecated: " + "sockets (%u) * dies (%u) * cores (%u) * threads (%u) " + "!= maxcpus (%u)", sockets, dies, cores, threads, ms->smp.max_cpus); exit(1); } - if (sockets * dies * cores * threads != ms->smp.max_cpus) { - warn_report("Invalid CPU topology deprecated: " - "sockets (%u) * dies (%u) * cores (%u) * threads (%u) " - "!= maxcpus (%u)", - sockets, dies, cores, threads, - ms->smp.max_cpus); - } - ms->smp.cpus = cpus; ms->smp.cores = cores; ms->smp.threads = threads; |