[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] s390x: add 2.6 compat machine
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH 1/6] s390x: add 2.6 compat machine |
Date: |
Thu, 17 Dec 2015 18:43:27 +0100 |
New qemu version, new machine.
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 5a52ff2..8d7d04b 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)
--
2.6.4
- [Qemu-devel] [PATCH 0/6] First set of s390x patches for 2.6, Cornelia Huck, 2015/12/17
- [Qemu-devel] [PATCH 4/6] s390x/pci: reject some operations to disabled PCI function, Cornelia Huck, 2015/12/17
- [Qemu-devel] [PATCH 1/6] s390x: add 2.6 compat machine,
Cornelia Huck <=
- [Qemu-devel] [PATCH 6/6] s390x/virtio: use qemu_check_nic_model(), Cornelia Huck, 2015/12/17
- [Qemu-devel] [PATCH 2/6] s390x: remove s390-virtio machine, Cornelia Huck, 2015/12/17
- [Qemu-devel] [PATCH 3/6] s390x: remove s390-virtio devices, Cornelia Huck, 2015/12/17
- [Qemu-devel] [PATCH 5/6] s390x/pci: code cleanup, Cornelia Huck, 2015/12/17