diff options
| author | Eric Auger <eric.auger@redhat.com> | 2018-06-22 13:28:37 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-22 13:28:37 +0100 |
| commit | 8ae9a1ca5b9bb0b3be06d51914ffba7c20dd62f8 (patch) | |
| tree | bbf10c545ba46e81411988b012a38082bb4304ac /hw | |
| parent | 601d626d148a6e50b4a0b5ae38f98682c5bf5e2a (diff) | |
hw/arm/virt: Add virt-3.0 machine type
Add virt-3.0 machine type.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-id: 1529072910-16156-10-git-send-email-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/virt.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 933e60612d..d8abf89e8c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1745,7 +1745,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); @@ -1813,11 +1813,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 |