Commit 70d8d9a0 authored by Cornelia Huck's avatar Cornelia Huck
Browse files

s390x: introduce 2.11 compat machine 



Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 5c8d6f00

hw/s390x/s390-virtio-ccw.c

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

    type_init(ccw_machine_register_##suffix)



#define CCW_COMPAT_2_10 \

        HW_COMPAT_2_10



#define CCW_COMPAT_2_9 \

        HW_COMPAT_2_9 \

        {\
@@ -506,8 +509,18 @@ bool css_migration_enabled(void) 
            .value    = "0",\

        },



static void ccw_machine_2_11_instance_options(MachineState *machine)

{

}



static void ccw_machine_2_11_class_options(MachineClass *mc)

{

}

DEFINE_CCW_MACHINE(2_11, "2.11", true);



static void ccw_machine_2_10_instance_options(MachineState *machine)

{

    ccw_machine_2_11_instance_options(machine);

    if (css_migration_enabled()) {

        css_register_vmstate();

    }
@@ -515,8 +528,10 @@ static void ccw_machine_2_10_instance_options(MachineState *machine) 


static void ccw_machine_2_10_class_options(MachineClass *mc)

{

    ccw_machine_2_11_class_options(mc);

    SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);

}

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

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



static void ccw_machine_2_9_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_10 \

    /* empty */



#define HW_COMPAT_2_9 \

    {\

        .driver   = "pci-bridge",\