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

s390x: add 2.6 compat machine 



New qemu version, new machine.

Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 649a1bba

hw/s390x/s390-virtio-ccw.c

+16 −2
Original line number Diff line number Diff line
@@ -297,9 +297,7 @@ static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data) 
{

    MachineClass *mc = MACHINE_CLASS(oc);



    mc->alias = "s390-ccw-virtio";

    mc->desc = "VirtIO-ccw based S390 machine v2.5";

    mc->is_default = 1;

}



static const TypeInfo ccw_machine_2_5_info = {
@@ -308,11 +306,27 @@ static const TypeInfo ccw_machine_2_5_info = { 
    .class_init    = ccw_machine_2_5_class_init,

};



static void ccw_machine_2_6_class_init(ObjectClass *oc, void *data)

{

    MachineClass *mc = MACHINE_CLASS(oc);



    mc->alias = "s390-ccw-virtio";

    mc->desc = "VirtIO-ccw based S390 machine v2.6";

    mc->is_default = 1;

}



static const TypeInfo ccw_machine_2_6_info = {

    .name          = MACHINE_TYPE_NAME("s390-ccw-virtio-2.6"),

    .parent        = TYPE_S390_CCW_MACHINE,

    .class_init    = ccw_machine_2_6_class_init,

};



static void ccw_machine_register_types(void)

{

    type_register_static(&ccw_machine_info);

    type_register_static(&ccw_machine_2_4_info);

    type_register_static(&ccw_machine_2_5_info);

    type_register_static(&ccw_machine_2_6_info);

}



type_init(ccw_machine_register_types)