david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/arm/virt: Add 2.10 machine type

Browse Source 
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>
This commit is contained in:
Eric Auger 2017-08-07 11:49:41 +00:00 committed by Peter Maydell
parent 3a789fcca0
commit f22ab6cb0c
1 changed files with 18 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

@ -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_9_options(MachineClass *mc)
static void virt_machine_2_10_options(MachineClass *mc)
{
}
DEFINE_VIRT_MACHINE_AS_LATEST(2, 9)
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(2, 9)
#define VIRT_COMPAT_2_8 \
HW_COMPAT_2_8