Commit 61823988 authored by Cornelia Huck's avatar Cornelia Huck
Browse files

s390x: add compat machine for 2.8 



Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent e87d397e

hw/s390x/s390-virtio-ccw.c

+17 −1
Original line number Diff line number Diff line
@@ -316,7 +316,11 @@ static const TypeInfo ccw_machine_info = { 
    }                                                                         \

    type_init(ccw_machine_register_##suffix)



#define CCW_COMPAT_2_7 \

        HW_COMPAT_2_7



#define CCW_COMPAT_2_6 \

        CCW_COMPAT_2_7 \

        HW_COMPAT_2_6 \

        {\

            .driver   = TYPE_S390_IPL,\
@@ -372,14 +376,26 @@ static const TypeInfo ccw_machine_info = { 
            .value    = "0",\

        },



static void ccw_machine_2_8_instance_options(MachineState *machine)

{

}



static void ccw_machine_2_8_class_options(MachineClass *mc)

{

}

DEFINE_CCW_MACHINE(2_8, "2.8", true);



static void ccw_machine_2_7_instance_options(MachineState *machine)

{

    ccw_machine_2_8_instance_options(machine);

}



static void ccw_machine_2_7_class_options(MachineClass *mc)

{

    ccw_machine_2_8_class_options(mc);

    SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_7);

}

DEFINE_CCW_MACHINE(2_7, "2.7", true);

DEFINE_CCW_MACHINE(2_7, "2.7", false);



static void ccw_machine_2_6_instance_options(MachineState *machine)

{

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_7 \

        /* empty */



#define HW_COMPAT_2_6 \

    {\

        .driver   = "virtio-mmio",\