From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrrdu-0006eO-KX for qemu-devel@nongnu.org; Thu, 29 Oct 2015 14:09:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zrrdq-0002a6-Ry for qemu-devel@nongnu.org; Thu, 29 Oct 2015 14:09:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrrdq-0002a0-LZ for qemu-devel@nongnu.org; Thu, 29 Oct 2015 14:09:38 -0400 From: Stefan Hajnoczi Date: Thu, 29 Oct 2015 18:09:17 +0000 Message-Id: <1446142165-24416-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1446142165-24416-1-git-send-email-stefanha@redhat.com> References: <1446142165-24416-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 04/12] s390x: include HW_COMPAT_* props List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , Peter Maydell , Stefan Hajnoczi From: Cornelia Huck We want to inherit generic hw compat as well. Signed-off-by: Cornelia Huck Acked-by: Christian Borntraeger Message-id: 1444991154-79217-2-git-send-email-cornelia.huck@de.ibm.com Signed-off-by: Stefan Hajnoczi --- hw/s390x/s390-virtio-ccw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index faba773..84221f4 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",\ -- 2.4.3