summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorShmulik Ladkani <shmulik.ladkani@ravellosystems.com>2015-12-23 21:42:11 +0200
committerCornelia Huck <cornelia.huck@de.ibm.com>2016-01-13 10:53:42 +0100
commitcf87e0a3eea4ccc91fdb84b96cf9b62f399b6f3d (patch)
tree160d1c658c968df1b3c1538babb2aec83299aa2d /hw
parente11f463295d95abab631e236d28d7c886eacc8e1 (diff)
downloadqemu-cf87e0a3eea4ccc91fdb84b96cf9b62f399b6f3d.tar.gz
s390: Introduce CCW_COMPAT_2_5
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 <shmulik.ladkani@ravellosystems.com> Message-Id: <1450899731-19517-1-git-send-email-shmulik.ladkani@ravellosystems.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/s390x/s390-virtio-ccw.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 8d7d04b7b5..586ddbb39a 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 = {