ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/unit/test-smp-parse: Add 'smp-with-dies' machine type 

Avoid modifying the MachineClass internals by adding the
'smp-with-dies' machine, which inherits from TYPE_MACHINE.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Tested-by: Yanan Wang <wangyanan55@huawei.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20211216132015.815493-4-philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2021-11-15 12:39:12 +01:00
parent c30bdb025c
commit 76b6d4cce3
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -487,6 +487,16 @@ static void machine_base_class_init(ObjectClass *oc, void *data)
mc->name = g_strdup(SMP_MACHINE_NAME); mc->name = g_strdup(SMP_MACHINE_NAME);
} }
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;
}
static void test_generic_valid(const void *opaque) static void test_generic_valid(const void *opaque)
{ {
const char *machine_type = opaque; const char *machine_type = opaque;
@ -548,9 +558,6 @@ static void test_with_dies(const void *opaque)
unsigned int num_dies = 2; unsigned int num_dies = 2;
int i; int i;
/* Force the SMP compat properties */
mc->smp_props.dies_supported = true;
for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) { for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
*data = data_generic_valid[i]; *data = data_generic_valid[i];
unsupported_params_init(mc, data); unsupported_params_init(mc, data);
@ -588,9 +595,6 @@ static void test_with_dies(const void *opaque)
smp_parse_test(ms, data, false); smp_parse_test(ms, data, false);
} }
/* Restore the SMP compat properties */
mc->smp_props.dies_supported = false;
object_unref(obj); object_unref(obj);
} }
@ -602,6 +606,10 @@ static const TypeInfo smp_machine_types[] = {
.class_init = machine_base_class_init, .class_init = machine_base_class_init,
.class_size = sizeof(MachineClass), .class_size = sizeof(MachineClass),
.instance_size = sizeof(MachineState), .instance_size = sizeof(MachineState),
}, {
.name = MACHINE_TYPE_NAME("smp-with-dies"),
.parent = TYPE_MACHINE,
.class_init = machine_with_dies_class_init,
} }
}; };
@ -620,7 +628,7 @@ int main(int argc, char *argv[])
TYPE_MACHINE, TYPE_MACHINE,
test_generic_invalid); test_generic_invalid);
g_test_add_data_func("/test-smp-parse/with_dies", g_test_add_data_func("/test-smp-parse/with_dies",
TYPE_MACHINE, MACHINE_TYPE_NAME("smp-with-dies"),
test_with_dies); test_with_dies);
g_test_run(); g_test_run();