[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/8] s390x: add 2.5 compat s390-ccw-virtio machin
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH v3 1/8] s390x: add 2.5 compat s390-ccw-virtio machine |
Date: |
Mon, 31 Aug 2015 13:00:27 +0200 |
Reviewed-by: Jason J. Herne <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 4c51d1a..71df282 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -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)
--
2.5.1
- [Qemu-devel] [PATCH v3 6/8] s390x: Info skeys sub-command, (continued)
- [Qemu-devel] [PATCH v3 6/8] s390x: Info skeys sub-command, Cornelia Huck, 2015/08/31
- [Qemu-devel] [PATCH v3 4/8] s390x: Dump storage keys qmp command, Cornelia Huck, 2015/08/31
- [Qemu-devel] [PATCH v3 5/8] s390x: Dump-skeys hmp support, Cornelia Huck, 2015/08/31
- [Qemu-devel] [PATCH v3 8/8] s390x: Disable storage key migration on old machine type, Cornelia Huck, 2015/08/31
- [Qemu-devel] [PATCH v3 2/8] s390x: Create QOM device for s390 storage keys, Cornelia Huck, 2015/08/31
- [Qemu-devel] [PATCH v3 7/8] s390x: Migrate guest storage keys (initial memory only), Cornelia Huck, 2015/08/31
- [Qemu-devel] [PATCH v3 1/8] s390x: add 2.5 compat s390-ccw-virtio machine,
Cornelia Huck <=
- [Qemu-devel] [PATCH v3 3/8] s390x: Enable new s390-storage-keys device, Cornelia Huck, 2015/08/31