summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2015-10-16 12:25:52 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2015-10-29 17:59:26 +0000
commit54d8ec84fa444ed7c05e03f96895ba69a2b2e5bc (patch)
tree56c5e50e3cbb8ad0b8c71437ca093e8054cfde17
parenta201b0ff28d9fa0f965450c1ba7191eca69f9fd5 (diff)
downloadfocaccia-qemu-54d8ec84fa444ed7c05e03f96895ba69a2b2e5bc.tar.gz
focaccia-qemu-54d8ec84fa444ed7c05e03f96895ba69a2b2e5bc.zip
s390x: include HW_COMPAT_* props
We want to inherit generic hw compat as well.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-id: 1444991154-79217-2-git-send-email-cornelia.huck@de.ibm.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--hw/s390x/s390-virtio-ccw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index faba773592..84221f4f57 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -20,6 +20,7 @@
 #include "qemu/config-file.h"
 #include "s390-pci-bus.h"
 #include "hw/s390x/storage-keys.h"
+#include "hw/compat.h"
 
 #define TYPE_S390_CCW_MACHINE               "s390-ccw-machine"
 
@@ -236,6 +237,7 @@ static const TypeInfo ccw_machine_info = {
 };
 
 #define CCW_COMPAT_2_4 \
+        HW_COMPAT_2_4 \
         {\
             .driver   = TYPE_S390_SKEYS,\
             .property = "migration-enabled",\