mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/unit/test-smp-parse: Keep default MIN/MAX CPUs in machine_base_class_init

Browse Source 
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>
This commit is contained in:
Yanan Wang 2021-12-28 17:22:13 +08:00 committed by Philippe Mathieu-Daudé
parent 16f5738476
commit a2348fa232
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/unit/test-smp-parse.c
View File

@ -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,