diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-12-27 14:59:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-12-27 14:59:26 +0000 |
| commit | e353aac51b944de9cfce5c6cee6b5c28eddbbd77 (patch) | |
| tree | 1b3b5f4b65d1742b5d77825ef3432e8a7e443aa4 | |
| parent | 0bfa02595aa2b887d1e7f56600a5aec7067c71b0 (diff) | |
| download | qemu-e353aac51b944de9cfce5c6cee6b5c28eddbbd77.zip qemu-e353aac51b944de9cfce5c6cee6b5c28eddbbd77.tar.gz qemu-e353aac51b944de9cfce5c6cee6b5c28eddbbd77.tar.bz2 | |
hw/arm/virt: add 2.9 machine type
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
| -rw-r--r-- | hw/arm/virt.c | 19 | ||||
| -rw-r--r-- | include/hw/compat.h | 3 |
2 files changed, 20 insertions, 2 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d04e4ac..11c53a5 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1525,7 +1525,7 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); -static void virt_2_8_instance_init(Object *obj) +static void virt_2_9_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); @@ -1558,10 +1558,25 @@ static void virt_2_8_instance_init(Object *obj) "Valid values are 2, 3 and host", NULL); } +static void virt_machine_2_9_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(2, 9) + +#define VIRT_COMPAT_2_8 \ + HW_COMPAT_2_8 + +static void virt_2_8_instance_init(Object *obj) +{ + virt_2_9_instance_init(obj); +} + static void virt_machine_2_8_options(MachineClass *mc) { + virt_machine_2_9_options(mc); + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_8); } -DEFINE_VIRT_MACHINE_AS_LATEST(2, 8) +DEFINE_VIRT_MACHINE(2, 8) #define VIRT_COMPAT_2_7 \ HW_COMPAT_2_7 diff --git a/include/hw/compat.h b/include/hw/compat.h index 8dfc7a3..4fe44d1 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,6 +1,9 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_2_8 \ + /* empty */ + #define HW_COMPAT_2_7 \ {\ .driver = "virtio-pci",\ |