[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 06/14] tests/unit/test-smp-parse: Keep default MIN/MAX CPUs in
From: |
Yanan Wang |
Subject: |
[PATCH v5 06/14] tests/unit/test-smp-parse: Keep default MIN/MAX CPUs in machine_base_class_init |
Date: |
Tue, 28 Dec 2021 17:22:13 +0800 |
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>
---
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
- [PATCH v5 04/14] tests/unit/test-smp-parse: Add testcases for CPU clusters, (continued)
[PATCH v5 06/14] tests/unit/test-smp-parse: Keep default MIN/MAX CPUs in machine_base_class_init,
Yanan Wang <=
[PATCH v5 05/14] tests/unit/test-smp-parse: No need to explicitly zero MachineClass members, Yanan Wang, 2021/12/28
[PATCH v5 08/14] hw/arm/virt: Support clusters on ARM virt machines, Yanan Wang, 2021/12/28
[PATCH v5 07/14] MAINTAINERS: Self-recommended as reviewer of "Machine core", Yanan Wang, 2021/12/28
[PATCH v5 09/14] hw/arm/virt: Support cluster level in DT cpu-map, Yanan Wang, 2021/12/28
[PATCH v5 11/14] hw/arm/virt-acpi-build: Make an ARM specific PPTT generator, Yanan Wang, 2021/12/28
[PATCH v5 12/14] tests/acpi/bios-tables-test: Allow changes to virt/PPTT file, Yanan Wang, 2021/12/28
[PATCH v5 10/14] hw/acpi/aml-build: Improve scalability of PPTT generation, Yanan Wang, 2021/12/28