ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x: add 2.6 compat machine 

New qemu version, new machine.

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Cornelia Huck 2015-11-30 10:45:41 +01:00
parent 649a1bbaf9
commit b21b75981f
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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