Commit e353aac5 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/arm/virt: add 2.9 machine type 



Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
parent 0bfa0259

hw/arm/virt.c

+17 −2
Original line number Diff line number Diff line
@@ -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

include/hw/compat.h

+3 −0
Original line number Diff line number Diff line 
#ifndef HW_COMPAT_H

#define HW_COMPAT_H



#define HW_COMPAT_2_8 \

    /* empty */



#define HW_COMPAT_2_7 \

    {\

        .driver   = "virtio-pci",\