[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 4/6] hw/arm/virt: Add virt-3.0 machine type
From: |
Eric Auger |
Subject: |
[Qemu-devel] [RFC 4/6] hw/arm/virt: Add virt-3.0 machine type |
Date: |
Wed, 20 Jun 2018 15:07:31 +0200 |
Add virt-3.0 machine type.
Signed-off-by: Eric Auger <address@hidden>
---
Due to the kernel dependency, virt 3.1 will be targetted instead.
---
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 f0a4fa0..dd92ab9 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1692,10 +1692,7 @@ static void machvirt_machine_init(void)
}
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);
@@ -1763,11 +1760,25 @@ 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)
+
+#define VIRT_COMPAT_2_12 \
+ HW_COMPAT_2_12
+
+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] [RFC 0/6] KVM/ARM: Dynamic and larger GPA size, Eric Auger, 2018/06/20
- [Qemu-devel] [RFC 1/6] linux-headers: Partial update for KVM/ARM KVM_ARM_GET_MAX_VM_PHYS_SHIFT, Eric Auger, 2018/06/20
- [Qemu-devel] [RFC 3/6] kvm: add kvm_get_max_vm_phys_shift, Eric Auger, 2018/06/20
- [Qemu-devel] [RFC 2/6] hw/boards: Add a MachineState parameter to kvm_type callback, Eric Auger, 2018/06/20
- [Qemu-devel] [RFC 4/6] hw/arm/virt: Add virt-3.0 machine type,
Eric Auger <=
- [Qemu-devel] [RFC 6/6] hw/arm/virt: handle max_vm_phys_shift conflicts on migration, Eric Auger, 2018/06/20
- [Qemu-devel] [RFC 5/6] hw/arm/virt: support kvm_type property, Eric Auger, 2018/06/20