[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/13] tests/unit/test-smp-parse: Bump max_cpus to 4096
From: |
Zhao Liu |
Subject: |
[PATCH v2 06/13] tests/unit/test-smp-parse: Bump max_cpus to 4096 |
Date: |
Sat, 9 Mar 2024 00:01:41 +0800 |
From: Zhao Liu <zhao1.liu@intel.com>
The q35 machine is trying to support up to 4096 vCPUs [1], so it's
necessary to bump max_cpus in test-smp-parse to 4096 to cover the
topological needs of future machines.
[1]:
https://lore.kernel.org/qemu-devel/20240228143351.3967-1-anisinha@redhat.com/
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Tested-by: Xiaoling Song <xiaoling.song@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
tests/unit/test-smp-parse.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index 84e342277452..2eb9533bc505 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -20,8 +20,8 @@
#define T true
#define F false
-#define MIN_CPUS 1 /* set the min CPUs supported by the machine as 1 */
-#define MAX_CPUS 512 /* set the max CPUs supported by the machine as 512 */
+#define MIN_CPUS 1 /* set the min CPUs supported by the machine as 1 */
+#define MAX_CPUS 4096 /* set the max CPUs supported by the machine as 4096 */
#define SMP_MACHINE_NAME "TEST-SMP"
@@ -333,13 +333,13 @@ static const struct SMPTestData data_generic_invalid[] = {
"by machine '" SMP_MACHINE_NAME "' is 2",
}, {
/*
- * config: -smp 512
+ * config: -smp 4096
* The test machine should tweak the supported max CPUs to
- * 511 (MAX_CPUS - 1) for testing.
+ * 4095 (MAX_CPUS - 1) for testing.
*/
- .config = SMP_CONFIG_GENERIC(T, MAX_CPUS, F, 0, F, 0, F, 0, F, 0),
- .expect_error = "Invalid SMP CPUs 512. The max CPUs supported "
- "by machine '" SMP_MACHINE_NAME "' is 511",
+ .config = SMP_CONFIG_GENERIC(T, 4096, F, 0, F, 0, F, 0, F, 0),
+ .expect_error = "Invalid SMP CPUs 4096. The max CPUs supported "
+ "by machine '" SMP_MACHINE_NAME "' is 4095",
},
};
--
2.34.1
- [PATCH v2 00/13] Cleanup on SMP and its test, Zhao Liu, 2024/03/08
- [PATCH v2 01/13] hw/core/machine-smp: Remove deprecated "parameter=0" SMP configurations, Zhao Liu, 2024/03/08
- [PATCH v2 02/13] hw/core/machine-smp: Deprecate unsupported "parameter=1" SMP configurations, Zhao Liu, 2024/03/08
- [PATCH v2 03/13] hw/core/machine-smp: Calculate total CPUs once in machine_parse_smp_config(), Zhao Liu, 2024/03/08
- [PATCH v2 04/13] tests/unit/test-smp-parse: Drop the unsupported "dies=1" case, Zhao Liu, 2024/03/08
- [PATCH v2 05/13] tests/unit/test-smp-parse: Use CPU number macros in invalid topology case, Zhao Liu, 2024/03/08
- [PATCH v2 06/13] tests/unit/test-smp-parse: Bump max_cpus to 4096,
Zhao Liu <=
- [PATCH v2 07/13] tests/unit/test-smp-parse: Make test cases aware of the book/drawer, Zhao Liu, 2024/03/08
- [PATCH v2 08/13] tests/unit/test-smp-parse: Test "books" parameter in -smp, Zhao Liu, 2024/03/08
- [PATCH v2 09/13] tests/unit/test-smp-parse: Test "drawers" parameter in -smp, Zhao Liu, 2024/03/08
- [PATCH v2 10/13] tests/unit/test-smp-parse: Test "drawers" and "books" combination case, Zhao Liu, 2024/03/08
- [PATCH v2 11/13] tests/unit/test-smp-parse: Test the full 7-levels topology hierarchy, Zhao Liu, 2024/03/08
- [PATCH v2 12/13] tests/unit/test-smp-parse: Test smp_props.has_clusters, Zhao Liu, 2024/03/08
- [PATCH v2 13/13] tests/unit/test-smp-parse: Test "parameter=0" SMP configurations, Zhao Liu, 2024/03/08
- Re: [PATCH v2 00/13] Cleanup on SMP and its test, Philippe Mathieu-Daudé, 2024/03/08