OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/arm/virt: add 2.9 machine type

Browse Source 
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
This commit is contained in:
Peter Maydell 2016-12-27 14:59:26 +00:00
parent 0bfa02595a
commit e353aac51b
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/arm/virt.c
View File

@ -1525,7 +1525,7 @@ static void machvirt_machine_init(void)
} }
type_init(machvirt_machine_init); 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); 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); "Valid values are 2, 3 and host", NULL);
} }
static void virt_machine_2_8_options(MachineClass *mc) static void virt_machine_2_9_options(MachineClass *mc)
{ {
} }
DEFINE_VIRT_MACHINE_AS_LATEST(2, 8) 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(2, 8)
#define VIRT_COMPAT_2_7 \ #define VIRT_COMPAT_2_7 \
HW_COMPAT_2_7 HW_COMPAT_2_7

3
include/hw/compat.h
View File

@ -1,6 +1,9 @@
#ifndef HW_COMPAT_H #ifndef HW_COMPAT_H
#define HW_COMPAT_H #define HW_COMPAT_H
#define HW_COMPAT_2_8 \
/* empty */
#define HW_COMPAT_2_7 \ #define HW_COMPAT_2_7 \
{\ {\
.driver = "virtio-pci",\ .driver = "virtio-pci",\