[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/9] s390: Introduce CCW_COMPAT_2_5
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 7/9] s390: Introduce CCW_COMPAT_2_5 |
Date: |
Wed, 13 Jan 2016 16:01:42 +0100 |
From: Shmulik Ladkani <address@hidden>
In 240240d5 'pc: Add pc-*-2.6 machine classes' HW_COMPAT_2_5 and
PC_COMPAT_2_5 were introduced.
Accordingly, introduce CCW_COMPAT_2_5 that uses HW_COMPAT_2_5.
Signed-off-by: Shmulik Ladkani <address@hidden>
Message-Id: <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 8d7d04b..586ddbb 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -235,7 +235,11 @@ static const TypeInfo ccw_machine_info = {
},
};
+#define CCW_COMPAT_2_5 \
+ HW_COMPAT_2_5
+
#define CCW_COMPAT_2_4 \
+ CCW_COMPAT_2_5 \
HW_COMPAT_2_4 \
{\
.driver = TYPE_S390_SKEYS,\
@@ -296,8 +300,13 @@ static const TypeInfo ccw_machine_2_4_info = {
static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+ static GlobalProperty compat_props[] = {
+ CCW_COMPAT_2_5
+ { /* end of list */ }
+ };
mc->desc = "VirtIO-ccw based S390 machine v2.5";
+ mc->compat_props = compat_props;
}
static const TypeInfo ccw_machine_2_5_info = {
--
2.7.0
- [Qemu-devel] [PULL 0/9] First set of s390x patches for 2.6, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 8/9] virtio-ccw: fix sanity check for vector, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 2/9] s390x: remove s390-virtio machine, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 5/9] s390x/pci: code cleanup, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 1/9] s390x: add 2.6 compat machine, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 6/9] s390x/virtio: use qemu_check_nic_model(), Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 7/9] s390: Introduce CCW_COMPAT_2_5,
Cornelia Huck <=
- [Qemu-devel] [PULL 4/9] s390x/pci: reject some operations to disabled PCI function, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 9/9] s390x/pci: return real state during listing PCI, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 3/9] s390x: remove s390-virtio devices, Cornelia Huck, 2016/01/13
- Re: [Qemu-devel] [PULL 0/9] First set of s390x patches for 2.6, Peter Maydell, 2016/01/14