Commit 9ca056d6 authored by Cornelia Huck's avatar Cornelia Huck
Browse files

s390x: introduce 3.1 compat machine 



Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 627fce61

hw/s390x/s390-virtio-ccw.c

+16 −1
Original line number Diff line number Diff line
@@ -673,6 +673,9 @@ bool css_migration_enabled(void) 
    }                                                                         \

    type_init(ccw_machine_register_##suffix)



#define CCW_COMPAT_3_0 \

        HW_COMPAT_3_0



#define CCW_COMPAT_2_12 \

        HW_COMPAT_2_12
@@ -761,14 +764,26 @@ bool css_migration_enabled(void) 
            .value    = "0",\

        },



static void ccw_machine_3_1_instance_options(MachineState *machine)

{

}



static void ccw_machine_3_1_class_options(MachineClass *mc)

{

}

DEFINE_CCW_MACHINE(3_1, "3.1", true);



static void ccw_machine_3_0_instance_options(MachineState *machine)

{

    ccw_machine_3_1_instance_options(machine);

}



static void ccw_machine_3_0_class_options(MachineClass *mc)

{

    ccw_machine_3_1_class_options(mc);

    SET_MACHINE_COMPAT(mc, CCW_COMPAT_3_0);

}

DEFINE_CCW_MACHINE(3_0, "3.0", true);

DEFINE_CCW_MACHINE(3_0, "3.0", false);



static void ccw_machine_2_12_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_3_0 \

    /* empty */



#define HW_COMPAT_2_12 \

    {\

        .driver   = "migration",\