From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNgvy-00036o-Sv for qemu-devel@nongnu.org; Thu, 14 Jul 2016 09:44:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNgvy-0001hv-30 for qemu-devel@nongnu.org; Thu, 14 Jul 2016 09:44:10 -0400 From: Marcel Apfelbaum Date: Thu, 14 Jul 2016 16:43:41 +0300 Message-Id: <1468503826-10617-3-git-send-email-marcel@redhat.com> In-Reply-To: <1468503826-10617-1-git-send-email-marcel@redhat.com> References: <1468503826-10617-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH 2/7] hw/alpha: fix PCI bus initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel@redhat.com, qemu-ppc@nongnu.org, qemu-arm@nongnu.org, rth@twiddle.net, aurelien@aurel32.net, leon.alrae@imgtec.com, agraf@suse.de, peter.maydell@linaro.org, mark.cave-ayland@ilande.co.uk, mst@redhat.com, thuth@redhat.com Delay the host-bridge 'realization' until the PCI root bus is attached. Signed-off-by: Marcel Apfelbaum --- hw/alpha/typhoon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 97721b5..883db13 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -824,7 +824,6 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, int i; dev = qdev_create(NULL, TYPE_TYPHOON_PCI_HOST_BRIDGE); - qdev_init_nofail(dev); s = TYPHOON_PCI_HOST_BRIDGE(dev); phb = PCI_HOST_BRIDGE(dev); @@ -889,6 +888,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, &s->pchip.reg_mem, &s->pchip.reg_io, 0, 64, TYPE_PCI_BUS); phb->bus = b; + qdev_init_nofail(dev); /* Host memory as seen from the PCI side, via the IOMMU. */ memory_region_init_iommu(&s->pchip.iommu, OBJECT(s), &typhoon_iommu_ops, -- 2.4.3