[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 5/8] tests/unit/test-smp-parse: Add 'smp-generic-valid' machin
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v5 5/8] tests/unit/test-smp-parse: Add 'smp-generic-valid' machine type |
Date: |
Wed, 15 Dec 2021 17:48:53 +0100 |
Keep the common TYPE_MACHINE class initialization in
machine_base_class_init(), make it abstract, and move
the non-common code to a new class: "smp-generic-valid".
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/unit/test-smp-parse.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index 72e7236afd9..5349ae14824 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -478,13 +478,19 @@ static void machine_base_class_init(ObjectClass *oc, void
*data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+ mc->smp_props.prefer_sockets = true;
+
+ mc->name = g_strdup(SMP_MACHINE_NAME);
+}
+
+static void machine_without_dies_valid_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+
mc->min_cpus = MIN_CPUS;
mc->max_cpus = MAX_CPUS;
- mc->smp_props.prefer_sockets = true;
mc->smp_props.dies_supported = false;
-
- mc->name = g_strdup(SMP_MACHINE_NAME);
}
static void machine_without_dies_invalid_class_init(ObjectClass *oc, void
*data)
@@ -606,9 +612,14 @@ static const TypeInfo smp_machine_types[] = {
{
.name = TYPE_MACHINE,
.parent = TYPE_OBJECT,
+ .abstract = true,
.class_init = machine_base_class_init,
.class_size = sizeof(MachineClass),
.instance_size = sizeof(MachineState),
+ }, {
+ .name = MACHINE_TYPE_NAME("smp-generic-valid"),
+ .parent = TYPE_MACHINE,
+ .class_init = machine_without_dies_valid_class_init,
}, {
.name = MACHINE_TYPE_NAME("smp-generic-invalid"),
.parent = TYPE_MACHINE,
@@ -629,7 +640,7 @@ int main(int argc, char *argv[])
g_test_init(&argc, &argv, NULL);
g_test_add_data_func("/test-smp-parse/generic/valid",
- TYPE_MACHINE,
+ MACHINE_TYPE_NAME("smp-generic-valid"),
test_generic_valid);
g_test_add_data_func("/test-smp-parse/generic/invalid",
MACHINE_TYPE_NAME("smp-generic-invalid"),
--
2.33.1
- [PATCH v5 0/8] tests/unit: Rework test-smp-parse tests, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 1/8] tests/unit/test-smp-parse: Pass machine type as argument to tests, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 4/8] tests/unit/test-smp-parse: Add 'smp-generic-invalid' machine type, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 3/8] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 2/8] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 5/8] tests/unit/test-smp-parse: Add 'smp-generic-valid' machine type,
Philippe Mathieu-Daudé <=
- [PATCH v5 7/8] tests/unit/test-smp-parse: Constify some pointer/struct, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 8/8] hw/core: Rename smp_parse() -> machine_parse_smp_config(), Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 6/8] tests/unit/test-smp-parse: Simplify pointer to compound literal use, Philippe Mathieu-Daudé, 2021/12/15