[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/20] tests/unit/test-smp-parse: Keep default MIN/MAX CPUs in mac
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 17/20] tests/unit/test-smp-parse: Keep default MIN/MAX CPUs in machine_base_class_init |
Date: |
Fri, 31 Dec 2021 13:47:51 +0100 |
From: Yanan Wang <wangyanan55@huawei.com>
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 72d83d1bbc9..fdc39a846ca 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.33.1
- [PULL 07/20] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type, (continued)
- [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é, 2021/12/31
- [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é <=
- [PULL 18/20] MAINTAINERS: Self-recommended as reviewer of "Machine core", Philippe Mathieu-Daudé, 2021/12/31
- [PULL 19/20] MAINTAINERS: Change philmd's email address, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 20/20] MAINTAINERS: email address change, Philippe Mathieu-Daudé, 2021/12/31
- Re: [PULL 00/20] Machine-next patches for 2021-12-31, Richard Henderson, 2021/12/31
- Re: [PULL 00/20] Machine-next patches for 2021-12-31, Richard Henderson, 2021/12/31