[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/12] machine: reject -smp dies!=1 for non-PC machines
From: |
Paolo Bonzini |
Subject: |
[PULL 10/12] machine: reject -smp dies!=1 for non-PC machines |
Date: |
Tue, 8 Jun 2021 11:40:15 +0200 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/core/machine.c | 4 ++++
1 file changed, 4 insertions(+)
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;
--
2.31.1
- [PULL 00/12] Machine and OS X changes for 2021-06-08, Paolo Bonzini, 2021/06/08
- [PULL 04/12] vl: switch -M parsing to keyval, Paolo Bonzini, 2021/06/08
- [PULL 07/12] machine: move common smp_parse code to caller, Paolo Bonzini, 2021/06/08
- [PULL 01/12] qom: export more functions for use with non-UserCreatable objects, Paolo Bonzini, 2021/06/08
- [PULL 06/12] machine: move dies from X86MachineState to CpuTopology, Paolo Bonzini, 2021/06/08
- [PULL 05/12] qemu-option: remove now-dead code, Paolo Bonzini, 2021/06/08
- [PULL 03/12] keyval: introduce keyval_parse_into, Paolo Bonzini, 2021/06/08
- [PULL 02/12] keyval: introduce keyval_merge, Paolo Bonzini, 2021/06/08
- [PULL 08/12] machine: add error propagation to mc->smp_parse, Paolo Bonzini, 2021/06/08
- [PULL 10/12] machine: reject -smp dies!=1 for non-PC machines,
Paolo Bonzini <=
- [PULL 09/12] machine: pass QAPI struct to mc->smp_parse, Paolo Bonzini, 2021/06/08
- [PULL 11/12] machine: add smp compound property, Paolo Bonzini, 2021/06/08
- [PULL 12/12] vnc: avoid deprecation warnings for SASL on OS X, Paolo Bonzini, 2021/06/08
- Re: [PULL 00/12] Machine and OS X changes for 2021-06-08, Daniel P . Berrangé, 2021/06/08
- Re: [PULL 00/12] Machine and OS X changes for 2021-06-08, no-reply, 2021/06/09