[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 5/6] pc/machine: Disallow any configuration of dies for non-P
From: |
Yanan Wang |
Subject: |
[RFC PATCH 5/6] pc/machine: Disallow any configuration of dies for non-PC machines |
Date: |
Fri, 2 Jul 2021 18:07:38 +0800 |
Since a machine type does not support topology parameter of dies,
it's probably more reasonable to reject any explicit specification
to avoid possible confuse, including "dies=0" and "dies=1" although
they won't affect the calculation of non-PC machines.
Also a comment of struct SMPConfiguration is fixed.
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
---
hw/core/machine.c | 2 +-
qapi/machine.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 58882835be..55785feee2 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -747,7 +747,7 @@ static void smp_parse(MachineState *ms, SMPConfiguration
*config, Error **errp)
unsigned threads = config->has_threads ? config->threads : 0;
unsigned maxcpus = config->has_maxcpus ? config->maxcpus : 0;
- if (config->has_dies && config->dies != 0 && config->dies != 1) {
+ if (config->has_dies) {
error_setg(errp, "dies not supported by this machine's CPU topology");
}
diff --git a/qapi/machine.json b/qapi/machine.json
index c3210ee1fb..253f84abf6 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -1297,7 +1297,7 @@
#
# @dies: number of dies per socket in the CPU topology
#
-# @cores: number of cores per thread in the CPU topology
+# @cores: number of cores per die in the CPU topology
#
# @threads: number of threads per core in the CPU topology
#
--
2.19.1
[RFC PATCH 5/6] pc/machine: Disallow any configuration of dies for non-PC machines,
Yanan Wang <=
[RFC PATCH 2/6] machine: Perform zero-check for the computed value of sockets, Yanan Wang, 2021/07/02
[RFC PATCH 6/6] machine: Tweak the order of topology members in struct CpuTopology, Yanan Wang, 2021/07/02
[RFC PATCH 4/6] machine: Uniformly use maxcpus to calculate the missing values, Yanan Wang, 2021/07/02