[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/20] tests/unit/test-smp-parse: Add 'smp-generic-invalid' machin
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 08/20] tests/unit/test-smp-parse: Add 'smp-generic-invalid' machine type |
Date: |
Fri, 31 Dec 2021 13:47:42 +0100 |
Avoid modifying the MachineClass internals by adding the
'smp-generic-invalid' machine, which inherits from TYPE_MACHINE.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Message-Id: <20211216132015.815493-5-philmd@redhat.com>
---
tests/unit/test-smp-parse.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index f66cf7bb598..47e11089e22 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -487,6 +487,17 @@ static void machine_base_class_init(ObjectClass *oc, void
*data)
mc->name = g_strdup(SMP_MACHINE_NAME);
}
+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->smp_props.dies_supported = false;
+}
+
static void machine_with_dies_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -530,10 +541,6 @@ static void test_generic_invalid(const void *opaque)
SMPTestData *data = &(SMPTestData){};
int i;
- /* Force invalid min CPUs and max CPUs */
- mc->min_cpus = 2;
- mc->max_cpus = 511;
-
for (i = 0; i < ARRAY_SIZE(data_generic_invalid); i++) {
*data = data_generic_invalid[i];
unsupported_params_init(mc, data);
@@ -541,10 +548,6 @@ static void test_generic_invalid(const void *opaque)
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);
}
@@ -606,6 +609,10 @@ static const TypeInfo smp_machine_types[] = {
.class_init = machine_base_class_init,
.class_size = sizeof(MachineClass),
.instance_size = sizeof(MachineState),
+ }, {
+ .name = MACHINE_TYPE_NAME("smp-generic-invalid"),
+ .parent = TYPE_MACHINE,
+ .class_init = machine_generic_invalid_class_init,
}, {
.name = MACHINE_TYPE_NAME("smp-with-dies"),
.parent = TYPE_MACHINE,
@@ -625,7 +632,7 @@ int main(int argc, char *argv[])
TYPE_MACHINE,
test_generic_valid);
g_test_add_data_func("/test-smp-parse/generic/invalid",
- TYPE_MACHINE,
+ MACHINE_TYPE_NAME("smp-generic-invalid"),
test_generic_invalid);
g_test_add_data_func("/test-smp-parse/with_dies",
MACHINE_TYPE_NAME("smp-with-dies"),
--
2.33.1
- [PULL 00/20] Machine-next patches for 2021-12-31, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 01/20] hw/qdev: Cosmetic around documentation, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 02/20] hw/qdev: Correct qdev_init_gpio_out_named() documentation, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 03/20] hw/qdev: Correct qdev_connect_gpio_out_named() documentation, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 04/20] hw/qdev: Rename qdev_connect_gpio_out*() 'input_pin' parameter, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 05/20] tests/unit/test-smp-parse: Pass machine type as argument to tests, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 06/20] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 07/20] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 08/20] tests/unit/test-smp-parse: Add 'smp-generic-invalid' machine type,
Philippe Mathieu-Daudé <=
- [PULL 09/20] tests/unit/test-smp-parse: Add 'smp-generic-valid' machine type, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 10/20] tests/unit/test-smp-parse: Simplify pointer to compound literal use, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 11/20] tests/unit/test-smp-parse: Constify some pointer/struct, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 12/20] hw/core: Rename smp_parse() -> machine_parse_smp_config(), Philippe Mathieu-Daudé, 2021/12/31
- [PULL 14/20] hw/core/machine: Introduce CPU cluster topology support, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 13/20] qemu-options: Improve readability of SMP related Docs, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 15/20] tests/unit/test-smp-parse: Add testcases for CPU clusters, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 16/20] tests/unit/test-smp-parse: No need to explicitly zero MachineClass members, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 17/20] tests/unit/test-smp-parse: Keep default MIN/MAX CPUs in machine_base_class_init, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 18/20] MAINTAINERS: Self-recommended as reviewer of "Machine core", Philippe Mathieu-Daudé, 2021/12/31