From: Paolo Bonzini Date: Thu, 17 Jun 2021 15:53:07 +0000 (+0200) Subject: machine: reject -smp dies!=1 for non-PC machines X-Git-Tag: v6.1.0-rc0~52^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0aebebb561c9c23b9c6d3d58040f83547f059b5c;p=users%2Fdwmw2%2Fqemu.git machine: reject -smp dies!=1 for non-PC machines Reviewed-by: Daniel P. Berrangé Signed-off-by: Paolo Bonzini Message-Id: <20210617155308.928754-11-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- diff --git a/hw/core/machine.c b/hw/core/machine.c index 9ad8341a31..ffc076ae84 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -746,6 +746,10 @@ static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) unsigned cores = config->has_cores ? config->cores : 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 */ if (cpus == 0 || sockets == 0) { cores = cores > 0 ? cores : 1;