From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: Zhao Liu <zhao1.liu@intel.com>, Yongwei Ma <yongwei.ma@intel.com>
Subject: [PULL 10/15] tests/unit/test-smp-parse: Use default parameters=0 when not set in -smp
Date: Wed, 12 Jun 2024 15:20:50 +0200 [thread overview]
Message-ID: <20240612132055.326889-11-thuth@redhat.com> (raw)
In-Reply-To: <20240612132055.326889-1-thuth@redhat.com>
From: Zhao Liu <zhao1.liu@intel.com>
Since -smp allows parameters=1 whether the level is supported by
machine, to avoid the test scenarios where the parameter defaults to 1
cause some errors to be masked, explicitly set undesired parameters to
0.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Yongwei Ma <yongwei.ma@intel.com>
Message-ID: <20240529061925.350323-5-zhao1.liu@intel.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/unit/test-smp-parse.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index 5d99e0d923..e3a0a9d12d 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -436,7 +436,7 @@ static const struct SMPTestData data_with_clusters_invalid[] = {
static const struct SMPTestData data_with_books_invalid[] = {
{
/* config: -smp 16,books=2,sockets=2,cores=4,threads=2,maxcpus=16 */
- .config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, F, 1, T, 2, T,
+ .config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, F, 0, T, 2, T,
2, T, 4, T, 2, T, 16),
.expect_error = "Invalid CPU topology: "
"product of the hierarchy must match maxcpus: "
@@ -444,7 +444,7 @@ static const struct SMPTestData data_with_books_invalid[] = {
"!= maxcpus (16)",
}, {
/* config: -smp 34,books=2,sockets=2,cores=4,threads=2,maxcpus=32 */
- .config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, F, 1, T, 2, T,
+ .config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, F, 0, T, 2, T,
2, T, 4, T, 2, T, 32),
.expect_error = "Invalid CPU topology: "
"maxcpus must be equal to or greater than smp: "
@@ -456,7 +456,7 @@ static const struct SMPTestData data_with_books_invalid[] = {
static const struct SMPTestData data_with_drawers_invalid[] = {
{
/* config: -smp 16,drawers=2,sockets=2,cores=4,threads=2,maxcpus=16 */
- .config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, T, 2, F, 1, T,
+ .config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, T, 2, F, 0, T,
2, T, 4, T, 2, T, 16),
.expect_error = "Invalid CPU topology: "
"product of the hierarchy must match maxcpus: "
@@ -464,7 +464,7 @@ static const struct SMPTestData data_with_drawers_invalid[] = {
"!= maxcpus (16)",
}, {
/* config: -smp 34,drawers=2,sockets=2,cores=4,threads=2,maxcpus=32 */
- .config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, T, 2, F, 1, T,
+ .config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, T, 2, F, 0, T,
2, T, 4, T, 2, T, 32),
.expect_error = "Invalid CPU topology: "
"maxcpus must be equal to or greater than smp: "
--
2.45.2
next prev parent reply other threads:[~2024-06-12 13:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-12 13:20 [PULL 00/15] CPU-related test updates Thomas Huth
2024-06-12 13:20 ` [PULL 01/15] tests/avocado: Update LoongArch bios file Thomas Huth
2024-06-12 13:20 ` [PULL 02/15] qtest/x86/numa-test: do not use the obsolete 'pentium' cpu Thomas Huth
2024-06-12 13:20 ` [PULL 03/15] tests/qtest/libqtest: add qtest_has_cpu_model() api Thomas Huth
2024-06-12 13:20 ` [PULL 04/15] tests/qtest/x86: check for availability of older cpu models before running tests Thomas Huth
2024-06-12 13:20 ` [PULL 05/15] meson: Remove libibumad dependence Thomas Huth
2024-06-12 13:20 ` [PULL 06/15] test: " Thomas Huth
2024-06-12 13:20 ` [PULL 07/15] tests/unit/test-smp-parse: Fix comments of drawers and books case Thomas Huth
2024-06-12 13:20 ` [PULL 08/15] tests/unit/test-smp-parse: Fix comment of parameters=1 case Thomas Huth
2024-06-12 13:20 ` [PULL 09/15] tests/unit/test-smp-parse: Fix an invalid topology case Thomas Huth
2024-06-12 13:20 ` Thomas Huth [this message]
2024-06-12 13:20 ` [PULL 11/15] tests/unit/test-smp-parse: Make test cases aware of module level Thomas Huth
2024-06-12 13:20 ` [PULL 12/15] tests/unit/test-smp-parse: Test "modules" parameter in -smp Thomas Huth
2024-06-12 13:20 ` [PULL 13/15] tests/unit/test-smp-parse: Test "modules" and "dies" combination case Thomas Huth
2024-06-12 13:20 ` [PULL 14/15] tests/unit/test-smp-parse: Test the full 8-levels topology hierarchy Thomas Huth
2024-06-12 13:20 ` [PULL 15/15] tests/tcg/s390x: Allow specifying extra QEMU options on the command line Thomas Huth
2024-06-14 3:59 ` [PULL 00/15] CPU-related test updates Richard Henderson
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=20240612132055.326889-11-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=yongwei.ma@intel.com \
--cc=zhao1.liu@intel.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).