Commit 84b48ad6 authored by Cornelia Huck's avatar Cornelia Huck
Browse files

s390x: add 2.5 compat s390-ccw-virtio machine 



Reviewed-by: default avatarJason J. Herne <jjherne@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent f8b8091d

hw/s390x/s390-virtio-ccw.c

+17 −2
Original line number Diff line number Diff line
@@ -287,9 +287,7 @@ static void ccw_machine_2_4_class_init(ObjectClass *oc, void *data) 
    MachineClass *mc = MACHINE_CLASS(oc);



    mc->name = "s390-ccw-virtio-2.4";

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

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

    mc->is_default = 1;

}



static const TypeInfo ccw_machine_2_4_info = {
@@ -298,10 +296,27 @@ static const TypeInfo ccw_machine_2_4_info = { 
    .class_init    = ccw_machine_2_4_class_init,

};



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

{

    MachineClass *mc = MACHINE_CLASS(oc);



    mc->name = "s390-ccw-virtio-2.5";

    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 = {

    .name          = TYPE_S390_CCW_MACHINE "2.5",

    .parent        = TYPE_S390_CCW_MACHINE,

    .class_init    = ccw_machine_2_5_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_init(ccw_machine_register_types)