mirror of https://github.com/xemu-project/xemu.git
tests/unit/test-smp-parse: QOM'ify smp_machine_class_init()
smp_machine_class_init() is the actual TypeInfo::class_init(). Declare it as such in smp_machine_info, and avoid to call it manually in each test. Move smp_machine_info definition just before we register the type to avoid a forward declaration. Reviewed-by: Andrew Jones <drjones@redhat.com> 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: <20211115145900.2531865-3-philmd@redhat.com>
This commit is contained in:
parent
2523a79565
commit
c3440eff4c
|
@ -75,14 +75,6 @@ typedef struct SMPTestData {
|
||||||
const char *expect_error;
|
const char *expect_error;
|
||||||
} SMPTestData;
|
} SMPTestData;
|
||||||
|
|
||||||
/* Type info of the tested machine */
|
|
||||||
static const TypeInfo smp_machine_info = {
|
|
||||||
.name = TYPE_MACHINE,
|
|
||||||
.parent = TYPE_OBJECT,
|
|
||||||
.class_size = sizeof(MachineClass),
|
|
||||||
.instance_size = sizeof(MachineState),
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* List all the possible valid sub-collections of the generic 5
|
* List all the possible valid sub-collections of the generic 5
|
||||||
* topology parameters (i.e. cpus/maxcpus/sockets/cores/threads),
|
* topology parameters (i.e. cpus/maxcpus/sockets/cores/threads),
|
||||||
|
@ -480,9 +472,10 @@ static void unsupported_params_init(MachineClass *mc, SMPTestData *data)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Reset the related machine properties before each sub-test */
|
static void machine_base_class_init(ObjectClass *oc, void *data)
|
||||||
static void smp_machine_class_init(MachineClass *mc)
|
|
||||||
{
|
{
|
||||||
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||||||
|
|
||||||
mc->min_cpus = MIN_CPUS;
|
mc->min_cpus = MIN_CPUS;
|
||||||
mc->max_cpus = MAX_CPUS;
|
mc->max_cpus = MAX_CPUS;
|
||||||
|
|
||||||
|
@ -498,8 +491,6 @@ static void test_generic(void)
|
||||||
SMPTestData *data = &(SMPTestData){{ }};
|
SMPTestData *data = &(SMPTestData){{ }};
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
smp_machine_class_init(mc);
|
|
||||||
|
|
||||||
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);
|
||||||
|
@ -539,7 +530,6 @@ static void test_with_dies(void)
|
||||||
unsigned int num_dies = 2;
|
unsigned int num_dies = 2;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
smp_machine_class_init(mc);
|
|
||||||
/* Force the SMP compat properties */
|
/* Force the SMP compat properties */
|
||||||
mc->smp_props.dies_supported = true;
|
mc->smp_props.dies_supported = true;
|
||||||
|
|
||||||
|
@ -586,12 +576,24 @@ static void test_with_dies(void)
|
||||||
object_unref(obj);
|
object_unref(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Type info of the tested machine */
|
||||||
|
static const TypeInfo smp_machine_types[] = {
|
||||||
|
{
|
||||||
|
.name = TYPE_MACHINE,
|
||||||
|
.parent = TYPE_OBJECT,
|
||||||
|
.class_init = machine_base_class_init,
|
||||||
|
.class_size = sizeof(MachineClass),
|
||||||
|
.instance_size = sizeof(MachineState),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
DEFINE_TYPES(smp_machine_types)
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
g_test_init(&argc, &argv, NULL);
|
|
||||||
|
|
||||||
module_call_init(MODULE_INIT_QOM);
|
module_call_init(MODULE_INIT_QOM);
|
||||||
type_register_static(&smp_machine_info);
|
|
||||||
|
g_test_init(&argc, &argv, NULL);
|
||||||
|
|
||||||
g_test_add_func("/test-smp-parse/generic", test_generic);
|
g_test_add_func("/test-smp-parse/generic", test_generic);
|
||||||
g_test_add_func("/test-smp-parse/with_dies", test_with_dies);
|
g_test_add_func("/test-smp-parse/with_dies", test_with_dies);
|
||||||
|
|
Loading…
Reference in New Issue