{"id":807738,"url":"http://patchwork.ozlabs.org/api/patches/807738/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-4-cohuck@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830165252.13421-4-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:11","name":"[PULL,03/44] s390x: introduce 2.11 compat machine","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8ebfcf115689e917173a0f22c06edc457c90406f","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-4-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807738/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807738/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjBgr20ffz9s7C\n\tfor ;\n\tThu, 31 Aug 2017 03:04:40 +1000 (AEST)","from localhost ([::1]:51670 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6Pu-00038R-2u\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:04:38 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:56339)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6Es-0001Mn-9Z\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6Er-0004xN-IN\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:14 -0400","from mx1.redhat.com ([209.132.183.28]:47336)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6Er-0004x4-CT\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:13 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 4420E80F97;\n\tWed, 30 Aug 2017 16:53:12 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id B25A55DD64;\n\tWed, 30 Aug 2017 16:53:09 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 4420E80F97","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:11 +0200","Message-Id":"<20170830165252.13421-4-cohuck@redhat.com>","In-Reply-To":"<20170830165252.13421-1-cohuck@redhat.com>","References":"<20170830165252.13421-1-cohuck@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tWed, 30 Aug 2017 16:53:12 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 03/44] s390x: introduce 2.11 compat machine","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com, david@redhat.com, Cornelia Huck ,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Reviewed-by: David Hildenbrand \nReviewed-by: Halil Pasic \nSigned-off-by: Cornelia Huck \n---\n hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-\n include/hw/compat.h | 3 +++\n 2 files changed, 19 insertions(+), 1 deletion(-)","diff":"diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 1c7af39ce6..d3d67b8d77 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -432,6 +432,9 @@ bool css_migration_enabled(void)\n } \\\n type_init(ccw_machine_register_##suffix)\n \n+#define CCW_COMPAT_2_10 \\\n+ HW_COMPAT_2_10\n+\n #define CCW_COMPAT_2_9 \\\n HW_COMPAT_2_9 \\\n {\\\n@@ -506,8 +509,18 @@ bool css_migration_enabled(void)\n .value = \"0\",\\\n },\n \n+static void ccw_machine_2_11_instance_options(MachineState *machine)\n+{\n+}\n+\n+static void ccw_machine_2_11_class_options(MachineClass *mc)\n+{\n+}\n+DEFINE_CCW_MACHINE(2_11, \"2.11\", true);\n+\n static void ccw_machine_2_10_instance_options(MachineState *machine)\n {\n+ ccw_machine_2_11_instance_options(machine);\n if (css_migration_enabled()) {\n css_register_vmstate();\n }\n@@ -515,8 +528,10 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)\n \n static void ccw_machine_2_10_class_options(MachineClass *mc)\n {\n+ ccw_machine_2_11_class_options(mc);\n+ SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);\n }\n-DEFINE_CCW_MACHINE(2_10, \"2.10\", true);\n+DEFINE_CCW_MACHINE(2_10, \"2.10\", false);\n \n static void ccw_machine_2_9_instance_options(MachineState *machine)\n {\ndiff --git a/include/hw/compat.h b/include/hw/compat.h\nindex 08f36004da..3e101f8f67 100644\n--- a/include/hw/compat.h\n+++ b/include/hw/compat.h\n@@ -1,6 +1,9 @@\n #ifndef HW_COMPAT_H\n #define HW_COMPAT_H\n \n+#define HW_COMPAT_2_10 \\\n+ /* empty */\n+\n #define HW_COMPAT_2_9 \\\n {\\\n .driver = \"pci-bridge\",\\\n","prefixes":["PULL","03/44"]}