summaryrefslogtreecommitdiffstats
path: root/hw/s390x/s390-virtio-ccw.c
diff options
context:
space:
mode:
authorCornelia Huck2015-11-30 10:45:41 +0100
committerCornelia Huck2016-01-13 10:53:41 +0100
commitb21b75981f0ee6113e1e65374591547da206ded2 (patch)
tree8fd2328a7e89259b4de1a44f29fbdf0494e722a7 /hw/s390x/s390-virtio-ccw.c
parentMerge remote-tracking branch 'remotes/kvaneesh/tags/for-upstream-signed' into... (diff)
downloadqemu-b21b75981f0ee6113e1e65374591547da206ded2.tar.gz
qemu-b21b75981f0ee6113e1e65374591547da206ded2.tar.xz
qemu-b21b75981f0ee6113e1e65374591547da206ded2.zip
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>
Diffstat (limited to 'hw/s390x/s390-virtio-ccw.c')
-rw-r--r--hw/s390x/s390-virtio-ccw.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 5a52ff26eb..8d7d04b7b5 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -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)