[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/11] hw/arm/virt: Add virt-3.0 machine type
From: |
Eric Auger |
Subject: |
[Qemu-devel] [PATCH v2 09/11] hw/arm/virt: Add virt-3.0 machine type |
Date: |
Fri, 15 Jun 2018 16:28:28 +0200 |
Add virt-3.0 machine type.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Andrew Jones <address@hidden>
---
hw/arm/virt.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 45d5ed0..75a1a14 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1743,7 +1743,7 @@ type_init(machvirt_machine_init);
#define VIRT_COMPAT_2_12 \
HW_COMPAT_2_12
-static void virt_2_12_instance_init(Object *obj)
+static void virt_3_0_instance_init(Object *obj)
{
VirtMachineState *vms = VIRT_MACHINE(obj);
VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
@@ -1811,11 +1811,22 @@ static void virt_2_12_instance_init(Object *obj)
vms->irqmap = a15irqmap;
}
+static void virt_machine_3_0_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(3, 0)
+
+static void virt_2_12_instance_init(Object *obj)
+{
+ virt_3_0_instance_init(obj);
+}
+
static void virt_machine_2_12_options(MachineClass *mc)
{
+ virt_machine_3_0_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_12);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(2, 12)
+DEFINE_VIRT_MACHINE(2, 12)
#define VIRT_COMPAT_2_11 \
HW_COMPAT_2_11
--
2.5.5
- [Qemu-devel] [PATCH v2 07/11] hw/arm/virt: Register two redistributor regions when necessary, (continued)
[Qemu-devel] [PATCH v2 08/11] hw/arm/virt: Add a new 256MB ECAM region, Eric Auger, 2018/06/15
[Qemu-devel] [PATCH v2 09/11] hw/arm/virt: Add virt-3.0 machine type,
Eric Auger <=
[Qemu-devel] [PATCH v2 11/11] hw/arm/virt: Increase max_cpus to 512, Eric Auger, 2018/06/15
[Qemu-devel] [PATCH v2 10/11] hw/arm/virt: Use 256MB ECAM region by default, Eric Auger, 2018/06/15
Re: [Qemu-devel] [PATCH v2 00/11] KVM/ARM: virt-3.0: Multiple redistributor regions and 256MB ECAM region, Peter Maydell, 2018/06/20