mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x: add 2.5 compat s390-ccw-virtio machine

Browse Source 
Reviewed-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Cornelia Huck 2015-07-17 13:16:52 +02:00
parent f8b8091d27
commit 84b48ad63b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/s390x/s390-virtio-ccw.c
View File

@ -287,9 +287,7 @@ static void ccw_machine_2_4_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
mc->name = "s390-ccw-virtio-2.4"; mc->name = "s390-ccw-virtio-2.4";
mc->alias = "s390-ccw-virtio";
mc->desc = "VirtIO-ccw based S390 machine v2.4"; mc->desc = "VirtIO-ccw based S390 machine v2.4";
mc->is_default = 1;
} }
static const TypeInfo ccw_machine_2_4_info = { 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, .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) static void ccw_machine_register_types(void)
{ {
type_register_static(&ccw_machine_info); type_register_static(&ccw_machine_info);
type_register_static(&ccw_machine_2_4_info); type_register_static(&ccw_machine_2_4_info);
type_register_static(&ccw_machine_2_5_info);
} }
type_init(ccw_machine_register_types) type_init(ccw_machine_register_types)