[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/30] hw/arm/virt: separate versioned type-init code
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 05/30] hw/arm/virt: separate versioned type-init code |
Date: |
Tue, 14 Jun 2016 15:13:40 +0100 |
From: Andrew Jones <address@hidden>
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 <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/virt.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 0f830a3..84c7c36 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1420,6 +1420,12 @@ static const TypeInfo virt_machine_info = {
.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)
{
VirtMachineState *vms = VIRT_MACHINE(obj);
@@ -1461,17 +1467,15 @@ static void virt_2_6_class_init(ObjectClass *oc, void
*data)
mc->alias = "virt";
}
-static const TypeInfo machvirt_info = {
+static const TypeInfo machvirt_2_6_info = {
.name = MACHINE_TYPE_NAME("virt-2.6"),
.parent = TYPE_VIRT_MACHINE,
.instance_init = virt_2_6_instance_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_info);
+ type_register_static(&machvirt_2_6_info);
}
-
-type_init(machvirt_machine_init);
+type_init(machvirt_machine_2_6_init);
--
1.9.1
- [Qemu-devel] [PULL 00/30] target-arm queue, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 04/30] target-arm: Fix reset and migration of TTBCR(S), Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 05/30] hw/arm/virt: separate versioned type-init code,
Peter Maydell <=
- [Qemu-devel] [PULL 01/30] target-arm: kvm64: set guest PMUv3 feature bit if supported, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 12/30] hw/i2c: QOM'ify versatile_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 13/30] hw/gpio: QOM'ify omap_gpio.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 06/30] hw/arm/virt: introduce DEFINE_VIRT_MACHINE, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 14/30] hw/gpio: QOM'ify pl061.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 16/30] hw/misc: QOM'ify arm_l2x0.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 02/30] hw/arm/virt: Add PMU node for virt machine, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 15/30] hw/gpio: QOM'ify zaurus.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 08/30] hw/arm/virt: create the 2.7 machine type, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 10/30] hw/i2c: QOM'ify exynos4210_i2c.c, Peter Maydell, 2016/06/14