77 lines
2.5 KiB
Diff
77 lines
2.5 KiB
Diff
From 214511b1799b94cfd514a222d087bb888ed808ba Mon Sep 17 00:00:00 2001
|
|
From: Yanan Wang <wangyanan55@huawei.com>
|
|
Date: Tue, 28 Dec 2021 17:22:13 +0800
|
|
Subject: [PATCH 14/24] tests/unit/test-smp-parse: Keep default MIN/MAX CPUs in
|
|
machine_base_class_init
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Most machine types in test-smp-parse will be OK to have the default
|
|
MIN/MAX CPUs except "smp-generic-invalid", let's keep the default
|
|
values in machine_base_class_init which will be inherited. And if
|
|
we hope a different value for a specific machine, modify it in its
|
|
own initialization function.
|
|
|
|
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Message-Id: <20211228092221.21068-7-wangyanan55@huawei.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
---
|
|
tests/unit/test-smp-parse.c | 16 ++--------------
|
|
1 file changed, 2 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
|
|
index 72d83d1bbc..fdc39a846c 100644
|
|
--- a/tests/unit/test-smp-parse.c
|
|
+++ b/tests/unit/test-smp-parse.c
|
|
@@ -523,15 +523,10 @@ static void machine_base_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
- mc->name = g_strdup(SMP_MACHINE_NAME);
|
|
-}
|
|
-
|
|
-static void machine_generic_valid_class_init(ObjectClass *oc, void *data)
|
|
-{
|
|
- MachineClass *mc = MACHINE_CLASS(oc);
|
|
-
|
|
mc->min_cpus = MIN_CPUS;
|
|
mc->max_cpus = MAX_CPUS;
|
|
+
|
|
+ mc->name = g_strdup(SMP_MACHINE_NAME);
|
|
}
|
|
|
|
static void machine_generic_invalid_class_init(ObjectClass *oc, void *data)
|
|
@@ -547,9 +542,6 @@ static void machine_with_dies_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
- mc->min_cpus = MIN_CPUS;
|
|
- mc->max_cpus = MAX_CPUS;
|
|
-
|
|
mc->smp_props.dies_supported = true;
|
|
}
|
|
|
|
@@ -557,9 +549,6 @@ static void machine_with_clusters_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
- mc->min_cpus = MIN_CPUS;
|
|
- mc->max_cpus = MAX_CPUS;
|
|
-
|
|
mc->smp_props.clusters_supported = true;
|
|
}
|
|
|
|
@@ -718,7 +707,6 @@ static const TypeInfo smp_machine_types[] = {
|
|
}, {
|
|
.name = MACHINE_TYPE_NAME("smp-generic-valid"),
|
|
.parent = TYPE_MACHINE,
|
|
- .class_init = machine_generic_valid_class_init,
|
|
}, {
|
|
.name = MACHINE_TYPE_NAME("smp-generic-invalid"),
|
|
.parent = TYPE_MACHINE,
|
|
--
|
|
2.27.0
|
|
|