diff options
| author | Eric Auger | 2017-08-07 13:49:41 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-07 15:16:31 +0200 |
| commit | f22ab6cb0c47bd2a2785b7d58130949bd7d8d9af (patch) | |
| tree | d333fc0533673db2d81526076e4f63b73fa1f2b6 | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' int... (diff) | |
| download | qemu-f22ab6cb0c47bd2a2785b7d58130949bd7d8d9af.tar.gz qemu-f22ab6cb0c47bd2a2785b7d58130949bd7d8d9af.tar.xz qemu-f22ab6cb0c47bd2a2785b7d58130949bd7d8d9af.zip | |
hw/arm/virt: Add 2.10 machine type
Add virt-2.10 machine type.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-id: 1502106581-11714-1-git-send-email-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -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 31739d75a3..6b7a0fefc4 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1639,7 +1639,7 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); -static void virt_2_9_instance_init(Object *obj) +static void virt_2_10_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); @@ -1699,10 +1699,25 @@ static void virt_2_9_instance_init(Object *obj) vms->irqmap = a15irqmap; } +static void virt_machine_2_10_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(2, 10) + +#define VIRT_COMPAT_2_9 \ + HW_COMPAT_2_9 + +static void virt_2_9_instance_init(Object *obj) +{ + virt_2_10_instance_init(obj); +} + static void virt_machine_2_9_options(MachineClass *mc) { + virt_machine_2_10_options(mc); + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_9); } -DEFINE_VIRT_MACHINE_AS_LATEST(2, 9) +DEFINE_VIRT_MACHINE(2, 9) #define VIRT_COMPAT_2_8 \ HW_COMPAT_2_8 |