| Message ID | 20240118144857.2124034-2-zhao1.liu@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests/unit/test-smp-parse.c: Add more CPU topology test cases | expand |
On 18/01/2024 15.48, Zhao Liu wrote: > From: Zhao Liu <zhao1.liu@intel.com> > > Use MAX_CPUS/MIN_CPUS micros in invalid topology case. This gives us the s/micros/macros/ Apart from that typo, FWIW: Reviewed-by: Thomas Huth <thuth@redhat.com> > flexibility to change the maximum and minimum CPU limits. > > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> > --- > tests/unit/test-smp-parse.c | 22 ++++++++++++++-------- > 1 file changed, 14 insertions(+), 8 deletions(-) > > diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c > index 24972666a74d..20c663a006b3 100644 > --- a/tests/unit/test-smp-parse.c > +++ b/tests/unit/test-smp-parse.c > @@ -323,15 +323,21 @@ static const struct SMPTestData data_generic_invalid[] = { > "sockets (2) * cores (4) * threads (2) " > "== maxcpus (16) < smp_cpus (18)", > }, { > - /* config: -smp 1 > - * should tweak the supported min CPUs to 2 for testing */ > - .config = SMP_CONFIG_GENERIC(T, 1, F, 0, F, 0, F, 0, F, 0), > + /* > + * config: -smp 1 > + * The test machine should tweak the supported min CPUs to > + * 2 (MIN_CPUS + 1) for testing. > + */ > + .config = SMP_CONFIG_GENERIC(T, MIN_CPUS, F, 0, F, 0, F, 0, F, 0), > .expect_error = "Invalid SMP CPUs 1. The min CPUs supported " > "by machine '" SMP_MACHINE_NAME "' is 2", > }, { > - /* config: -smp 512 > - * should tweak the supported max CPUs to 511 for testing */ > - .config = SMP_CONFIG_GENERIC(T, 512, F, 0, F, 0, F, 0, F, 0), > + /* > + * config: -smp 512 > + * The test machine should tweak the supported max CPUs to > + * 511 (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", > }, > @@ -575,8 +581,8 @@ static void machine_generic_invalid_class_init(ObjectClass *oc, void *data) > MachineClass *mc = MACHINE_CLASS(oc); > > /* Force invalid min CPUs and max CPUs */ > - mc->min_cpus = 2; > - mc->max_cpus = 511; > + mc->min_cpus = MIN_CPUS + 1; > + mc->max_cpus = MAX_CPUS - 1; > } > > static void machine_with_dies_class_init(ObjectClass *oc, void *data)
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 24972666a74d..20c663a006b3 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -323,15 +323,21 @@ static const struct SMPTestData data_generic_invalid[] = { "sockets (2) * cores (4) * threads (2) " "== maxcpus (16) < smp_cpus (18)", }, { - /* config: -smp 1 - * should tweak the supported min CPUs to 2 for testing */ - .config = SMP_CONFIG_GENERIC(T, 1, F, 0, F, 0, F, 0, F, 0), + /* + * config: -smp 1 + * The test machine should tweak the supported min CPUs to + * 2 (MIN_CPUS + 1) for testing. + */ + .config = SMP_CONFIG_GENERIC(T, MIN_CPUS, F, 0, F, 0, F, 0, F, 0), .expect_error = "Invalid SMP CPUs 1. The min CPUs supported " "by machine '" SMP_MACHINE_NAME "' is 2", }, { - /* config: -smp 512 - * should tweak the supported max CPUs to 511 for testing */ - .config = SMP_CONFIG_GENERIC(T, 512, F, 0, F, 0, F, 0, F, 0), + /* + * config: -smp 512 + * The test machine should tweak the supported max CPUs to + * 511 (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", }, @@ -575,8 +581,8 @@ static void machine_generic_invalid_class_init(ObjectClass *oc, void *data) MachineClass *mc = MACHINE_CLASS(oc); /* Force invalid min CPUs and max CPUs */ - mc->min_cpus = 2; - mc->max_cpus = 511; + mc->min_cpus = MIN_CPUS + 1; + mc->max_cpus = MAX_CPUS - 1; } static void machine_with_dies_class_init(ObjectClass *oc, void *data)