From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHAl9-0005Se-I4 for qemu-devel@nongnu.org; Thu, 07 Jan 2016 08:37:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHAl5-0001W1-HU for qemu-devel@nongnu.org; Thu, 07 Jan 2016 08:37:47 -0500 Received: from e06smtp08.uk.ibm.com ([195.75.94.104]:35605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHAl5-0001Vx-7l for qemu-devel@nongnu.org; Thu, 07 Jan 2016 08:37:43 -0500 Received: from localhost by e06smtp08.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Jan 2016 13:37:42 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id A2C6A17D8062 for ; Thu, 7 Jan 2016 13:38:00 +0000 (GMT) Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u07DbEBA9765142 for ; Thu, 7 Jan 2016 13:37:14 GMT Received: from d06av01.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u07DbEOJ026684 for ; Thu, 7 Jan 2016 06:37:14 -0700 From: Cornelia Huck Date: Thu, 7 Jan 2016 14:36:56 +0100 Message-Id: <1452173818-13661-8-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1452173818-13661-1-git-send-email-cornelia.huck@de.ibm.com> References: <1452173818-13661-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH v2 7/9] s390: Introduce CCW_COMPAT_2_5 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de, Shmulik Ladkani From: Shmulik Ladkani 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 Message-Id: <1450899731-19517-1-git-send-email-shmulik.ladkani@ravellosystems.com> Signed-off-by: Cornelia Huck --- 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.6.4