From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHW3j-0004lh-I3 for qemu-devel@nongnu.org; Fri, 08 Jan 2016 07:22:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHW3f-0006Mf-HY for qemu-devel@nongnu.org; Fri, 08 Jan 2016 07:22:23 -0500 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:40326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHW3f-0006Kz-94 for qemu-devel@nongnu.org; Fri, 08 Jan 2016 07:22:19 -0500 Received: from localhost by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 8 Jan 2016 12:22:16 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 3471E1B08061 for ; Fri, 8 Jan 2016 12:22:57 +0000 (GMT) Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u08CMEhB4849944 for ; Fri, 8 Jan 2016 12:22:14 GMT Received: from d06av08.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u08CMEDX010613 for ; Fri, 8 Jan 2016 05:22:14 -0700 References: <1452173818-13661-1-git-send-email-cornelia.huck@de.ibm.com> <1452173818-13661-2-git-send-email-cornelia.huck@de.ibm.com> From: Christian Borntraeger Message-ID: <568FA9ED.7020708@de.ibm.com> Date: Fri, 8 Jan 2016 13:22:05 +0100 MIME-Version: 1.0 In-Reply-To: <1452173818-13661-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 v2 1/9] s390x: add 2.6 compat 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 On 01/07/2016 02:36 PM, Cornelia Huck wrote: > New qemu version, new machine. > > Signed-off-by: Cornelia Huck Acked-by: Christian Borntraeger > --- > hw/s390x/s390-virtio-ccw.c | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 5a52ff2..8d7d04b 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -297,9 +297,7 @@ static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > > - 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 = { > @@ -308,11 +306,27 @@ static const TypeInfo ccw_machine_2_5_info = { > .class_init = ccw_machine_2_5_class_init, > }; > > +static void ccw_machine_2_6_class_init(ObjectClass *oc, void *data) > +{ > + MachineClass *mc = MACHINE_CLASS(oc); > + > + mc->alias = "s390-ccw-virtio"; > + mc->desc = "VirtIO-ccw based S390 machine v2.6"; > + mc->is_default = 1; > +} > + > +static const TypeInfo ccw_machine_2_6_info = { > + .name = MACHINE_TYPE_NAME("s390-ccw-virtio-2.6"), > + .parent = TYPE_S390_CCW_MACHINE, > + .class_init = ccw_machine_2_6_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_register_static(&ccw_machine_2_6_info); > } > > type_init(ccw_machine_register_types) >