From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHAkk-0004ez-5m for qemu-devel@nongnu.org; Thu, 07 Jan 2016 08:37:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHAkf-0001SH-Up for qemu-devel@nongnu.org; Thu, 07 Jan 2016 08:37:22 -0500 Received: from e06smtp09.uk.ibm.com ([195.75.94.105]:35542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHAkf-0001Ra-Kl for qemu-devel@nongnu.org; Thu, 07 Jan 2016 08:37:17 -0500 Received: from localhost by e06smtp09.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Jan 2016 13:37:16 -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 437B417D8062 for ; Thu, 7 Jan 2016 13:37:59 +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 u07DbDjI917940 for ; Thu, 7 Jan 2016 13:37:13 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 u07DbDNQ026570 for ; Thu, 7 Jan 2016 06:37:13 -0700 From: Cornelia Huck Date: Thu, 7 Jan 2016 14:36:50 +0100 Message-Id: <1452173818-13661-2-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 1/9] s390x: add 2.6 compat machine 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 New qemu version, new machine. Signed-off-by: Cornelia Huck --- 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) -- 2.6.4