From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHW5g-0006u8-Qb for qemu-devel@nongnu.org; Fri, 08 Jan 2016 07:24:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHW5c-0006xI-Nn for qemu-devel@nongnu.org; Fri, 08 Jan 2016 07:24:24 -0500 Received: from e06smtp06.uk.ibm.com ([195.75.94.102]:50396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHW5c-0006xE-Dx for qemu-devel@nongnu.org; Fri, 08 Jan 2016 07:24:20 -0500 Received: from localhost by e06smtp06.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 8 Jan 2016 12:24:19 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id B4154219004D for ; Fri, 8 Jan 2016 12:24:06 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u08COHDe5046750 for ; Fri, 8 Jan 2016 12:24:17 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u08COGMR019600 for ; Fri, 8 Jan 2016 05:24:17 -0700 References: <1452173818-13661-1-git-send-email-cornelia.huck@de.ibm.com> <1452173818-13661-8-git-send-email-cornelia.huck@de.ibm.com> From: Christian Borntraeger Message-ID: <568FAA70.5000704@de.ibm.com> Date: Fri, 8 Jan 2016 13:24:16 +0100 MIME-Version: 1.0 In-Reply-To: <1452173818-13661-8-git-send-email-cornelia.huck@de.ibm.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [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: Cornelia Huck , qemu-devel@nongnu.org Cc: jfrei@linux.vnet.ibm.com, agraf@suse.de, Shmulik Ladkani On 01/07/2016 02:36 PM, Cornelia Huck wrote: > 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 Acked-by: Christian Borntraeger > --- > 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 = { >