From patchwork Thu Jan 7 13:36:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 564291 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 058F51402E2 for ; Fri, 8 Jan 2016 00:39:57 +1100 (AEDT) Received: from localhost ([::1]:58681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHAnC-00016H-QS for incoming@patchwork.ozlabs.org; Thu, 07 Jan 2016 08:39:54 -0500 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 d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp09.uk.ibm.com (192.168.101.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 7 Jan 2016 13:37:14 -0000 X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com X-IBM-MailFrom: cornelia.huck@de.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org 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 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-197.boeblingen.de.ibm.com [9.152.224.197]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u07DbCT9026542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 7 Jan 2016 06:37:12 -0700 From: Cornelia Huck To: qemu-devel@nongnu.org Date: Thu, 7 Jan 2016 14:36:50 +0100 Message-Id: <1452173818-13661-2-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 2.6.4 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> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16010713-0037-0000-0000-0000052FA046 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.105 Cc: Cornelia Huck , borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de Subject: [Qemu-devel] [PATCH v2 1/9] s390x: add 2.6 compat machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)