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

hw/arm/virt: separate versioned type-init code 

Rename machvirt_info (which is specifically for 2.6 TypeInfo)
to machvirt_2_6_info, and separate the type registration of the
abstract machine type from the versioned type.

Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1465746713-30414-2-git-send-email-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andrew Jones 2016-06-14 15:59:12 +01:00 committed by Peter Maydell
parent 811595a2d4
commit 7a2ecd95d9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/arm/virt.c
View File

@ -1420,6 +1420,12 @@ static const TypeInfo virt_machine_info = {
.class_init = virt_machine_class_init, .class_init = virt_machine_class_init,
}; };
static void machvirt_machine_init(void)
{
type_register_static(&virt_machine_info);
}
type_init(machvirt_machine_init);
static void virt_2_6_instance_init(Object *obj) static void virt_2_6_instance_init(Object *obj)
{ {
VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineState *vms = VIRT_MACHINE(obj);
@ -1461,17 +1467,15 @@ static void virt_2_6_class_init(ObjectClass *oc, void *data)
mc->alias = "virt"; mc->alias = "virt";
} }
static const TypeInfo machvirt_info = { static const TypeInfo machvirt_2_6_info = {
.name = MACHINE_TYPE_NAME("virt-2.6"), .name = MACHINE_TYPE_NAME("virt-2.6"),
.parent = TYPE_VIRT_MACHINE, .parent = TYPE_VIRT_MACHINE,
.instance_init = virt_2_6_instance_init, .instance_init = virt_2_6_instance_init,
.class_init = virt_2_6_class_init, .class_init = virt_2_6_class_init,
}; };
static void machvirt_machine_init(void) static void machvirt_machine_2_6_init(void)
{ {
type_register_static(&virt_machine_info); type_register_static(&machvirt_2_6_info);
type_register_static(&machvirt_info);
} }
type_init(machvirt_machine_2_6_init);
type_init(machvirt_machine_init);