diff options
| author | Eric Auger <eric.auger@redhat.com> | 2017-11-24 10:43:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-24 11:28:56 +0000 |
| commit | 79283dda3021316aa6b552086ec6a4aaa3b3b329 (patch) | |
| tree | e3e2895c19e4744e4c651ebe64af224fd8239a9f /hw/arm/virt.c | |
| parent | 38e83b6bed80ebabcbab22f9d5b5215071e32b52 (diff) | |
| download | focaccia-qemu-79283dda3021316aa6b552086ec6a4aaa3b3b329.tar.gz focaccia-qemu-79283dda3021316aa6b552086ec6a4aaa3b3b329.zip | |
hw/arm/virt: Add 2.11 machine type
Add virt-2.11 machine type. Signed-off-by: Eric Auger <eric.auger@redhat.com> Message-id: 1511516626-21178-1-git-send-email-eric.auger@redhat.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/virt.c')
| -rw-r--r-- | hw/arm/virt.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9e18b410d7..151592b1e5 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1618,7 +1618,7 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); -static void virt_2_10_instance_init(Object *obj) +static void virt_2_11_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); @@ -1678,10 +1678,25 @@ static void virt_2_10_instance_init(Object *obj) vms->irqmap = a15irqmap; } +static void virt_machine_2_11_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(2, 11) + +#define VIRT_COMPAT_2_10 \ + HW_COMPAT_2_10 + +static void virt_2_10_instance_init(Object *obj) +{ + virt_2_11_instance_init(obj); +} + static void virt_machine_2_10_options(MachineClass *mc) { + virt_machine_2_11_options(mc); + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_10); } -DEFINE_VIRT_MACHINE_AS_LATEST(2, 10) +DEFINE_VIRT_MACHINE(2, 10) #define VIRT_COMPAT_2_9 \ HW_COMPAT_2_9 |