From: Yanan Wang <wangyanan55@huawei.com>
To: Eduardo Habkost <ehabkost@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Andrew Jones" <drjones@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Pierre Morel" <pmorel@linux.ibm.com>,
"Pankaj Gupta" <pankaj.gupta.linux@gmail.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
qemu-devel@nongnu.org, "Yanan Wang" <wangyanan55@huawei.com>,
qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Igor Mammedov" <imammedo@redhat.com>,
wanghaibin.wang@huawei.com,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [PATCH v10 06/14] qtest/numa-test: Use detailed -smp CLIs in pc_dynamic_cpu_cfg
Date: Sun, 26 Sep 2021 16:45:33 +0800 [thread overview]
Message-ID: <20210926084541.17352-7-wangyanan55@huawei.com> (raw)
In-Reply-To: <20210926084541.17352-1-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 testing if we
have strong dependency on the parsing results.
pc_dynamic_cpu_cfg currently assumes/needs that there will be 2 CPU
sockets with "-smp 2". To avoid breaking the test because of parsing
logic change, now explicitly use "-smp 2,sockets=2".
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Andrew Jones <drjones@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 c677cd63c4..fd7a2e80a0 100644
--- a/tests/qtest/numa-test.c
+++ b/tests/qtest/numa-test.c
@@ -265,7 +265,8 @@ static void pc_dynamic_cpu_cfg(const void *data)
QTestState *qs;
g_autofree char *cli = NULL;
- cli = make_cli(data, "-nodefaults --preconfig -machine smp.cpus=2");
+ cli = make_cli(data, "-nodefaults --preconfig "
+ "-machine smp.cpus=2,smp.sockets=2");
qs = qtest_init(cli);
/* create 2 numa nodes */
--
2.19.1
next prev parent reply other threads:[~2021-09-26 8:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-26 8:45 [PATCH v10 00/14] machine: smp parsing fixes and improvement Yanan Wang
2021-09-26 8:45 ` [PATCH v10 01/14] machine: Deprecate "parameter=0" SMP configurations Yanan Wang
2021-09-26 8:45 ` [PATCH v10 02/14] machine: Minor refactor/fix for the smp parsers Yanan Wang
2021-09-26 8:45 ` [PATCH v10 03/14] machine: Uniformly use maxcpus to calculate the omitted parameters Yanan Wang
2021-09-26 8:45 ` [PATCH v10 04/14] machine: Set the value of cpus to match maxcpus if it's omitted Yanan Wang
2021-09-26 8:45 ` [PATCH v10 05/14] machine: Improve the error reporting of smp parsing Yanan Wang
2021-09-26 8:45 ` Yanan Wang [this message]
2021-09-26 8:45 ` [PATCH v10 07/14] qtest/numa-test: Use detailed -smp CLIs in test_def_cpu_split Yanan Wang
2021-09-26 8:45 ` [PATCH v10 08/14] machine: Prefer cores over sockets in smp parsing since 6.2 Yanan Wang
2021-09-26 8:45 ` [PATCH v10 09/14] machine: Use ms instead of global current_machine in sanity-check Yanan Wang
2021-09-26 8:45 ` [PATCH v10 10/14] machine: Tweak the order of topology members in struct CpuTopology Yanan Wang
2021-09-26 8:45 ` [PATCH v10 11/14] machine: Make smp_parse generic enough for all arches Yanan Wang
2021-09-27 10:12 ` Daniel P. Berrangé
2021-09-28 1:21 ` wangyanan (Y)
2021-09-26 8:45 ` [PATCH v10 12/14] machine: Remove smp_parse callback from MachineClass Yanan Wang
2021-09-26 8:45 ` [PATCH v10 13/14] machine: Move smp_prefer_sockets to struct SMPCompatProps Yanan Wang
2021-09-26 8:45 ` [PATCH v10 14/14] machine: Put all sanity-check in the generic SMP parser Yanan Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210926084541.17352-7-wangyanan55@huawei.com \
--to=wangyanan55@huawei.com \
--cc=berrange@redhat.com \
--cc=cohuck@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=drjones@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pankaj.gupta.linux@gmail.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=pmorel@linux.ibm.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=wanghaibin.wang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).