From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MPLUd-0001fH-Cd
	for qemu-devel@nongnu.org; Fri, 10 Jul 2009 15:10:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MPLUb-0001ei-Vh
	for qemu-devel@nongnu.org; Fri, 10 Jul 2009 15:10:46 -0400
Received: from [199.232.76.173] (port=57262 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MPLUb-0001eb-SZ
	for qemu-devel@nongnu.org; Fri, 10 Jul 2009 15:10:45 -0400
Received: from fg-out-1718.google.com ([72.14.220.156]:55693)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <blauwirbel@gmail.com>) id 1MPLUb-0007Zt-Ga
	for qemu-devel@nongnu.org; Fri, 10 Jul 2009 15:10:45 -0400
Received: by fg-out-1718.google.com with SMTP id l27so91246fgb.8
	for <qemu-devel@nongnu.org>; Fri, 10 Jul 2009 12:10:43 -0700 (PDT)
MIME-Version: 1.0
Date: Fri, 10 Jul 2009 22:10:43 +0300
Message-ID: <f43fc5580907101210v7138d10awacdf006069283598@mail.gmail.com>
From: Blue Swirl <blauwirbel@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Sparc64 breakage by
	16eaedf2668e9b347a59d73346fcc4c764c58348
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paul Brook <paul@codesourcery.com>, qemu-devel <qemu-devel@nongnu.org>

Hi,

APB is not converted to qdev yet, so pci_register_secondary_bus
shouldn't use FROM_QBUS. Sparc64 is currently broken.

Partially reverting 16eaed... fixes the breakage:
diff --git a/hw/pci.c b/hw/pci.c
index 71d9227..f592925 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -135,7 +135,7 @@ static PCIBus
*pci_register_secondary_bus(PCIDevice *dev, pci_map_irq_fn map_irq
 {
     PCIBus *bus;

-    bus = FROM_QBUS(PCIBus, qbus_create(&pci_bus_info, &dev->qdev, NULL));
+    bus = qemu_mallocz(sizeof(PCIBus));
     bus->map_irq = map_irq;
     bus->parent_dev = dev;
     bus->next = dev->bus->next;