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

hw/arm/virt: Add virt-3.1 machine type

Browse Source 
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andrew Jones 2018-08-20 11:24:32 +01:00 committed by Peter Maydell
parent 55c544ed27
commit 22907d2b81
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/arm/virt.c
View File

@ -1791,10 +1791,7 @@ static void machvirt_machine_init(void)
} }
type_init(machvirt_machine_init); type_init(machvirt_machine_init);
#define VIRT_COMPAT_2_12 \ static void virt_3_1_instance_init(Object *obj)
HW_COMPAT_2_12
static void virt_3_0_instance_init(Object *obj)
{ {
VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineState *vms = VIRT_MACHINE(obj);
VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
@ -1864,10 +1861,24 @@ static void virt_3_0_instance_init(Object *obj)
vms->irqmap = a15irqmap; vms->irqmap = a15irqmap;
} }
static void virt_machine_3_0_options(MachineClass *mc) static void virt_machine_3_1_options(MachineClass *mc)
{ {
} }
DEFINE_VIRT_MACHINE_AS_LATEST(3, 0) DEFINE_VIRT_MACHINE_AS_LATEST(3, 1)
static void virt_3_0_instance_init(Object *obj)
{
virt_3_1_instance_init(obj);
}
static void virt_machine_3_0_options(MachineClass *mc)
{
virt_machine_3_1_options(mc);
}
DEFINE_VIRT_MACHINE(3, 0)
#define VIRT_COMPAT_2_12 \
HW_COMPAT_2_12
static void virt_2_12_instance_init(Object *obj) static void virt_2_12_instance_init(Object *obj)
{ {