[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-6.2 v4 01/11] tests/unit/test-smp-parse: Restore MachineClass
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-6.2 v4 01/11] tests/unit/test-smp-parse: Restore MachineClass fields after modifying |
Date: |
Mon, 15 Nov 2021 15:58:50 +0100 |
There is a single MachineClass object, registered with
type_register_static(&smp_machine_info). Since the same
object is used multiple times (an MachineState object
is instantiated in both test_generic and test_with_dies),
we should restore its internal state after modifying for
the test purpose.
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Tested-by: Yanan Wang <wangyanan55@huawei.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/unit/test-smp-parse.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index cbe0c990494..47774c1ee2a 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -512,7 +512,7 @@ static void test_generic(void)
smp_parse_test(ms, data, true);
}
- /* Reset the supported min CPUs and max CPUs */
+ /* Force invalid min CPUs and max CPUs */
mc->min_cpus = 2;
mc->max_cpus = 511;
@@ -523,6 +523,10 @@ static void test_generic(void)
smp_parse_test(ms, data, false);
}
+ /* Reset the supported min CPUs and max CPUs */
+ mc->min_cpus = MIN_CPUS;
+ mc->max_cpus = MAX_CPUS;
+
object_unref(obj);
}
@@ -536,6 +540,7 @@ static void test_with_dies(void)
int i;
smp_machine_class_init(mc);
+ /* Force the SMP compat properties */
mc->smp_props.dies_supported = true;
for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
@@ -575,6 +580,9 @@ static void test_with_dies(void)
smp_parse_test(ms, data, false);
}
+ /* Restore the SMP compat properties */
+ mc->smp_props.dies_supported = false;
+
object_unref(obj);
}
--
2.31.1
- [PATCH v4 00/11] tests/unit: Fix test-smp-parse, Philippe Mathieu-Daudé, 2021/11/15
- [PATCH-for-6.2 v4 01/11] tests/unit/test-smp-parse: Restore MachineClass fields after modifying,
Philippe Mathieu-Daudé <=
- [PATCH-for-6.2 v4 02/11] tests/unit/test-smp-parse: QOM'ify smp_machine_class_init(), Philippe Mathieu-Daudé, 2021/11/15
- [PATCH-for-6.2 v4 03/11] tests/unit/test-smp-parse: Explicit MachineClass name, Philippe Mathieu-Daudé, 2021/11/15
- [PATCH-for-7.0 v4 06/11] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type, Philippe Mathieu-Daudé, 2021/11/15
- [PATCH-for-7.0 v4 07/11] tests/unit/test-smp-parse: Add 'smp-without-dies-invalid' machine type, Philippe Mathieu-Daudé, 2021/11/15
- [PATCH-for-7.0 v4 05/11] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid, Philippe Mathieu-Daudé, 2021/11/15