ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

machine: reject -smp dies!=1 for non-PC machines 

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210617155308.928754-11-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-06-17 17:53:07 +02:00
parent 1e63fe6858
commit 0aebebb561
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/core/machine.c
View File

@ -746,6 +746,10 @@ static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp)
unsigned cores = config->has_cores ? config->cores : 0; unsigned cores = config->has_cores ? config->cores : 0;
unsigned threads = config->has_threads ? config->threads : 0; unsigned threads = config->has_threads ? config->threads : 0;
if (config->has_dies && config->dies != 0 && config->dies != 1) {
error_setg(errp, "dies not supported by this machine's CPU topology");
}
/* compute missing values, prefer sockets over cores over threads */ /* compute missing values, prefer sockets over cores over threads */
if (cpus == 0 || sockets == 0) { if (cpus == 0 || sockets == 0) {
cores = cores > 0 ? cores : 1; cores = cores > 0 ? cores : 1;