From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHBal-00039D-ED for qemu-devel@nongnu.org; Mon, 20 Jul 2015 09:58:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHBag-0005kP-8s for qemu-devel@nongnu.org; Mon, 20 Jul 2015 09:58:51 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:35258) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHBag-0005gg-13 for qemu-devel@nongnu.org; Mon, 20 Jul 2015 09:58:46 -0400 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 20 Jul 2015 14:58:43 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 84F47219004D for ; Mon, 20 Jul 2015 14:58:16 +0100 (BST) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t6KDwdQ331391758 for ; Mon, 20 Jul 2015 13:58:39 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t6K8pLHj016561 for ; Mon, 20 Jul 2015 04:51:21 -0400 Message-ID: <55ACFE8E.1080500@de.ibm.com> Date: Mon, 20 Jul 2015 15:58:38 +0200 From: Christian Borntraeger MIME-Version: 1.0 References: <1437400198-25382-1-git-send-email-cornelia.huck@de.ibm.com> <1437400198-25382-2-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1437400198-25382-2-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 for-2.5 1/8] s390x: add 2.5 compat s390-ccw-virtio machine 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, jjherne@linux.vnet.ibm.com Am 20.07.2015 um 15:49 schrieb Cornelia Huck: > Reviewed-by: Jason J. Herne > Signed-off-by: Cornelia Huck for post 2.4 Acked-by: Christian Borntraeger > --- > hw/s390x/s390-virtio-ccw.c | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 4c51d1a..708763e 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -289,7 +289,6 @@ static void ccw_machine_2_4_class_init(ObjectClass *oc, void *data) > mc->name = "s390-ccw-virtio-2.4"; > mc->alias = "s390-ccw-virtio"; > mc->desc = "VirtIO-ccw based S390 machine v2.4"; > - mc->is_default = 1; > } > > static const TypeInfo ccw_machine_2_4_info = { > @@ -298,10 +297,27 @@ static const TypeInfo ccw_machine_2_4_info = { > .class_init = ccw_machine_2_4_class_init, > }; > > +static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data) > +{ > + MachineClass *mc = MACHINE_CLASS(oc); > + > + mc->name = "s390-ccw-virtio-2.5"; > + mc->alias = "s390-ccw-virtio"; > + mc->desc = "VirtIO-ccw based S390 machine v2.5"; > + mc->is_default = 1; > +} > + > +static const TypeInfo ccw_machine_2_5_info = { > + .name = TYPE_S390_CCW_MACHINE "2.5", > + .parent = TYPE_S390_CCW_MACHINE, > + .class_init = ccw_machine_2_5_class_init, > +}; > + > static void ccw_machine_register_types(void) > { > type_register_static(&ccw_machine_info); > type_register_static(&ccw_machine_2_4_info); > + type_register_static(&ccw_machine_2_5_info); > } > > type_init(ccw_machine_register_types) >