[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RFC PATCH 1/6] hw/arm/virt: Add virt-3.1 machine type
From: |
Andrew Jones |
Subject: |
[Qemu-arm] [RFC PATCH 1/6] hw/arm/virt: Add virt-3.1 machine type |
Date: |
Wed, 4 Jul 2018 14:49:18 +0200 |
Signed-off-by: Andrew Jones <address@hidden>
---
hw/arm/virt.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 281ddcdf6e26..880441275031 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1757,10 +1757,7 @@ static void machvirt_machine_init(void)
}
type_init(machvirt_machine_init);
-#define VIRT_COMPAT_2_12 \
- HW_COMPAT_2_12
-
-static void virt_3_0_instance_init(Object *obj)
+static void virt_3_1_instance_init(Object *obj)
{
VirtMachineState *vms = VIRT_MACHINE(obj);
VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
@@ -1830,10 +1827,24 @@ static void virt_3_0_instance_init(Object *obj)
vms->irqmap = a15irqmap;
}
+static void virt_machine_3_1_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(3, 1)
+
+static void virt_3_0_instance_init(Object *obj)
+{
+ virt_3_1_instance_init(obj);
+}
+
static void virt_machine_3_0_options(MachineClass *mc)
{
+ virt_machine_3_1_options(mc);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(3, 0)
+DEFINE_VIRT_MACHINE(3, 0)
+
+#define VIRT_COMPAT_2_12 \
+ HW_COMPAT_2_12
static void virt_2_12_instance_init(Object *obj)
{
--
2.17.1