[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/30] qtest/numa-test: Use detailed -smp CLIs in test_def_cpu_spl
From: |
Paolo Bonzini |
Subject: |
[PULL 08/30] qtest/numa-test: Use detailed -smp CLIs in test_def_cpu_split |
Date: |
Sun, 3 Oct 2021 09:42:28 +0200 |
From: Yanan Wang <wangyanan55@huawei.com>
Since commit 80d7835749 (qemu-options: rewrite help for -smp options),
the preference of sockets/cores in -smp parsing is considered liable
to change, and actually we are going to change it in a coming commit.
So it'll be more stable to use detailed -smp CLIs in the testcases
that have strong dependency on the parsing results.
Currently, test_def_cpu_split use "-smp 8" and will get 8 CPU sockets
based on current parsing rule. But if we change to prefer cores over
sockets we will get one CPU socket with 8 cores, and this testcase
will not get expected numa set by default on x86_64 (Ok on aarch64).
So now explicitly use "-smp 8,sockets=8" to avoid affect from parsing
logic change.
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210929025816.21076-9-wangyanan55@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/qtest/numa-test.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c
index fd7a2e80a0..90bf68a5b3 100644
--- a/tests/qtest/numa-test.c
+++ b/tests/qtest/numa-test.c
@@ -42,7 +42,8 @@ static void test_def_cpu_split(const void *data)
g_autofree char *s = NULL;
g_autofree char *cli = NULL;
- cli = make_cli(data, "-machine smp.cpus=8 -numa node,memdev=ram -numa
node");
+ cli = make_cli(data, "-machine smp.cpus=8,smp.sockets=8 "
+ "-numa node,memdev=ram -numa node");
qts = qtest_init(cli);
s = qtest_hmp(qts, "info numa");
--
2.31.1
- [PULL 00/30] Misc changes for 2021-10-03, Paolo Bonzini, 2021/10/03
- [PULL 01/30] qapi/machine: Fix an incorrect comment of SMPConfiguration, Paolo Bonzini, 2021/10/03
- [PULL 03/30] machine: Minor refactor/fix for the smp parsers, Paolo Bonzini, 2021/10/03
- [PULL 02/30] machine: Deprecate "parameter=0" SMP configurations, Paolo Bonzini, 2021/10/03
- [PULL 05/30] machine: Set the value of cpus to match maxcpus if it's omitted, Paolo Bonzini, 2021/10/03
- [PULL 04/30] machine: Uniformly use maxcpus to calculate the omitted parameters, Paolo Bonzini, 2021/10/03
- [PULL 06/30] machine: Improve the error reporting of smp parsing, Paolo Bonzini, 2021/10/03
- [PULL 09/30] machine: Prefer cores over sockets in smp parsing since 6.2, Paolo Bonzini, 2021/10/03
- [PULL 08/30] qtest/numa-test: Use detailed -smp CLIs in test_def_cpu_split,
Paolo Bonzini <=
- [PULL 07/30] qtest/numa-test: Use detailed -smp CLIs in pc_dynamic_cpu_cfg, Paolo Bonzini, 2021/10/03
- [PULL 11/30] machine: Tweak the order of topology members in struct CpuTopology, Paolo Bonzini, 2021/10/03
- [PULL 12/30] machine: Make smp_parse generic enough for all arches, Paolo Bonzini, 2021/10/03
- [PULL 10/30] machine: Use ms instead of global current_machine in sanity-check, Paolo Bonzini, 2021/10/03
- [PULL 13/30] machine: Remove smp_parse callback from MachineClass, Paolo Bonzini, 2021/10/03
- [PULL 14/30] machine: Move smp_prefer_sockets to struct SMPCompatProps, Paolo Bonzini, 2021/10/03
- [PULL 15/30] machine: Use g_autoptr in machine_set_smp, Paolo Bonzini, 2021/10/03
- [PULL 16/30] machine: Put all sanity-check in the generic SMP parser, Paolo Bonzini, 2021/10/03
- [PULL 17/30] i386: Support KVM_CAP_ENFORCE_PV_FEATURE_CPUID, Paolo Bonzini, 2021/10/03
- [PULL 18/30] i386: Support KVM_CAP_HYPERV_ENFORCE_CPUID, Paolo Bonzini, 2021/10/03