{"id":818729,"url":"http://patchwork.ozlabs.org/api/patches/818729/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170926162058.30772-2-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":"<20170926162058.30772-2-cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-26T16:20:58","name":"[1/1] s390x: create a compat s390 phb for <=2.10","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f3eb2e03ae80c704393710ff6c2e343a4f780ac3","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/20170926162058.30772-2-cohuck@redhat.com/mbox/","series":[{"id":5179,"url":"http://patchwork.ozlabs.org/api/series/5179/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=5179","date":"2017-09-26T16:20:57","name":"s390x: more zpci compat fun","version":1,"mbox":"http://patchwork.ozlabs.org/series/5179/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818729/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818729/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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3y1mSB6q19z9t5C\n\tfor ;\n\tWed, 27 Sep 2017 02:22:02 +1000 (AEST)","from localhost ([::1]:49155 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dwscT-0000HQ-1g\n\tfor incoming@patchwork.ozlabs.org; Tue, 26 Sep 2017 12:22:01 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51537)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dwsbe-00005e-4x\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 12:21:11 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dwsbb-00089j-Q6\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 12:21:10 -0400","from mx1.redhat.com ([209.132.183.28]:39402)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dwsbb-00086c-Bt\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 12:21:07 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 1F359A78B;\n\tTue, 26 Sep 2017 16:21:06 +0000 (UTC)","from localhost (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 0A04377D42;\n\tTue, 26 Sep 2017 16:21:02 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 1F359A78B","From":"Cornelia Huck ","To":"qemu-devel@nongnu.org","Date":"Tue, 26 Sep 2017 18:20:58 +0200","Message-Id":"<20170926162058.30772-2-cohuck@redhat.com>","In-Reply-To":"<20170926162058.30772-1-cohuck@redhat.com>","References":"<20170926162058.30772-1-cohuck@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tTue, 26 Sep 2017 16:21:06 +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] [PATCH 1/1] s390x: create a compat s390 phb for <=2.10","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":"pasic@linux.vnet.ibm.com, zyimin@linux.vnet.ibm.com, david@redhat.com,\n\tCornelia Huck , agraf@suse.de,\n\tdgilbert@redhat.com, borntraeger@de.ibm.com, jjherne@linux.vnet.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\") made\ncreating the s390 phb dependant on the zpci facility. This broke\nmigration from pre-cpu model machines which was fixed with\n8ad9087c4a (\"s390x/ccw: create s390 phb for compat reasons as well\").\nHowever, that is not enough: Migration from 2.10 with -cpu z13\nbreaks as well.\n\nLet's create a phb for all pre-2.11 compat machines to fix this.\nWe leave the zpci facility off to avoid a guest-visible change\nwith cpu models on.\n\nReported-by: Christian Borntraeger \nFixes: d32bd032d8 (\"s390x/ccw: create s390 phb conditionally\")\nSigned-off-by: Cornelia Huck \n---\n hw/s390x/s390-virtio-ccw.c | 8 +++++++-\n include/hw/s390x/s390-virtio-ccw.h | 1 +\n 2 files changed, 8 insertions(+), 1 deletion(-)","diff":"diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 1bcb7000ab..981f1c4336 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -247,6 +247,8 @@ static void s390_create_virtio_net(BusState *bus, const char *name)\n }\n }\n \n+static S390CcwMachineClass *get_machine_class(void);\n+\n static void ccw_init(MachineState *machine)\n {\n int ret;\n@@ -266,7 +268,7 @@ static void ccw_init(MachineState *machine)\n machine->initrd_filename, \"s390-ccw.img\",\n \"s390-netboot.img\", true);\n \n- if (s390_has_feat(S390_FEAT_ZPCI)) {\n+ if (s390_has_feat(S390_FEAT_ZPCI) || get_machine_class()->phb_compat) {\n DeviceState *dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);\n object_property_add_child(qdev_get_machine(),\n TYPE_S390_PCI_HOST_BRIDGE,\n@@ -407,6 +409,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)\n s390mc->cpu_model_allowed = true;\n s390mc->css_migration_enabled = true;\n s390mc->gs_allowed = true;\n+ s390mc->phb_compat = false;\n mc->init = ccw_init;\n mc->reset = s390_machine_reset;\n mc->hot_add_cpu = s390_hot_add_cpu;\n@@ -716,6 +719,9 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)\n \n static void ccw_machine_2_10_class_options(MachineClass *mc)\n {\n+ S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);\n+\n+ s390mc->phb_compat = pci_available;\n ccw_machine_2_11_class_options(mc);\n SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);\n }\ndiff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h\nindex a9a90c2022..fb717afe92 100644\n--- a/include/hw/s390x/s390-virtio-ccw.h\n+++ b/include/hw/s390x/s390-virtio-ccw.h\n@@ -41,6 +41,7 @@ typedef struct S390CcwMachineClass {\n bool cpu_model_allowed;\n bool css_migration_enabled;\n bool gs_allowed;\n+ bool phb_compat;\n } S390CcwMachineClass;\n \n /* runtime-instrumentation allowed by the machine */\n","prefixes":["1/1"]}