On 18/01/2024 15.48, Zhao Liu wrote:
From: Zhao Liu <zhao1....@intel.com>
PC mahine is trying to support up to 4096 vCPUs [1], so it's necessary
s/mahine/machine/
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/20231208122611.32311-1-anisi...@redhat.com/
Is it ok for this test patch here to get included without that patch
already, or shall this wait for the patch from Ani first?
Thomas
Signed-off-by: Zhao Liu <zhao1....@intel.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 20c663a006b3..55ba13bf7d15 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",
},
};
