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

s390x: introduce 2.10 compat machine 



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

hw/s390x/s390-virtio-ccw.c

+16 −1
Original line number Diff line number Diff line
@@ -336,6 +336,9 @@ static const TypeInfo ccw_machine_info = { 
    }                                                                         \

    type_init(ccw_machine_register_##suffix)



#define CCW_COMPAT_2_9 \

        HW_COMPAT_2_9



#define CCW_COMPAT_2_8 \

        HW_COMPAT_2_8 \

        {\
@@ -402,14 +405,26 @@ static const TypeInfo ccw_machine_info = { 
            .value    = "0",\

        },



static void ccw_machine_2_10_instance_options(MachineState *machine)

{

}



static void ccw_machine_2_10_class_options(MachineClass *mc)

{

}

DEFINE_CCW_MACHINE(2_10, "2.10", true);



static void ccw_machine_2_9_instance_options(MachineState *machine)

{

    ccw_machine_2_10_instance_options(machine);

}



static void ccw_machine_2_9_class_options(MachineClass *mc)

{

    ccw_machine_2_10_class_options(mc);

    SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_9);

}

DEFINE_CCW_MACHINE(2_9, "2.9", true);

DEFINE_CCW_MACHINE(2_9, "2.9", false);



static void ccw_machine_2_8_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_9 \

    /* empty */



#define HW_COMPAT_2_8 \

    {\

        .driver   = "fw_cfg_mem",\