{"id":807746,"url":"http://patchwork.ozlabs.org/api/patches/807746/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-19-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-19-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:26","name":"[PULL,18/44] s390x/ccw: create s390 phb conditionally","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"df5193f9aa463ce7afc66b72c8be7e01d46c0bc9","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-19-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/807746/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807746/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-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.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 3xjBjS3VqCz9sNn\n\tfor ;\n\tThu, 31 Aug 2017 03:06:04 +1000 (AEST)","from localhost ([::1]:51678 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6RG-0004VB-6g\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:06:02 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57077)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6Fx-0002KA-8p\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:22 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6Fw-0005PR-EO\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:21 -0400","from mx1.redhat.com ([209.132.183.28]:53954)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6Fw-0005P4-7p\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:20 -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 22EFAC0587E5;\n\tWed, 30 Aug 2017 16:54:19 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id D62555D722;\n\tWed, 30 Aug 2017 16:54:16 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 22EFAC0587E5","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:26 +0200","Message-Id":"<20170830165252.13421-19-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.32]);\n\tWed, 30 Aug 2017 16:54:19 +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 18/44] s390x/ccw: create s390 phb conditionally","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":"Don't create the s390 pci host bridge if we do not provide the zpci\nfacility.\n\nReviewed-by: Thomas Huth \nAcked-by: Christian Borntraeger \nSigned-off-by: Cornelia Huck \n---\n hw/s390x/s390-virtio-ccw.c | 14 ++++++++------\n 1 file changed, 8 insertions(+), 6 deletions(-)","diff":"diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex d3d67b8d77..8331c0a275 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -118,12 +118,11 @@ static void ccw_init(MachineState *machine)\n {\n int ret;\n VirtualCssBus *css_bus;\n- DeviceState *dev;\n \n s390_sclp_init();\n s390_memory_init(machine->ram_size);\n \n- /* init CPUs */\n+ /* init CPUs (incl. CPU model) early so s390_has_feature() works */\n s390_init_cpus(machine);\n \n s390_flic_init();\n@@ -134,10 +133,13 @@ static void ccw_init(MachineState *machine)\n machine->initrd_filename, \"s390-ccw.img\",\n \"s390-netboot.img\", true);\n \n- dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);\n- object_property_add_child(qdev_get_machine(), TYPE_S390_PCI_HOST_BRIDGE,\n- OBJECT(dev), NULL);\n- qdev_init_nofail(dev);\n+ if (s390_has_feat(S390_FEAT_ZPCI)) {\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+ OBJECT(dev), NULL);\n+ qdev_init_nofail(dev);\n+ }\n \n /* register hypercalls */\n virtio_ccw_register_hcalls();\n","prefixes":["PULL","18/44"]}