From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1jvi-0005bg-EA for qemu-devel@nongnu.org; Tue, 23 Jul 2013 17:15:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1jvh-00056z-AI for qemu-devel@nongnu.org; Tue, 23 Jul 2013 17:15:34 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Tue, 23 Jul 2013 23:16:45 +0200 Message-Id: <1374614206-9368-2-git-send-email-hpoussin@reactos.org> In-Reply-To: <1374614206-9368-1-git-send-email-hpoussin@reactos.org> References: <1374614206-9368-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/2] prep_pci: set isa_mem_base in the PCI host bridge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org Currently, it is done by i82378 device, which shouldn't care of it. Signed-off-by: Herv=C3=A9 Poussineau --- hw/isa/i82378.c | 3 --- hw/pci-host/prep.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index b25ed04..de71d81 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -45,7 +45,6 @@ typedef struct I82378State { typedef struct PCIi82378State { PCIDevice pci_dev; uint32_t isa_io_base; - uint32_t isa_mem_base; I82378State state; } PCIi82378State; =20 @@ -234,7 +233,6 @@ static int pci_i82378_init(PCIDevice *dev) pci_set_long(dev->wmask + PCI_BASE_ADDRESS_0, 0); pci_set_long(pci_conf + PCI_BASE_ADDRESS_0, pci->isa_io_base); =20 - isa_mem_base =3D pci->isa_mem_base; isa_bus_new(&dev->qdev, pci_address_space_io(dev)); =20 i82378_init(&dev->qdev, s); @@ -244,7 +242,6 @@ static int pci_i82378_init(PCIDevice *dev) =20 static Property i82378_properties[] =3D { DEFINE_PROP_HEX32("iobase", PCIi82378State, isa_io_base, 0x80000000)= , - DEFINE_PROP_HEX32("membase", PCIi82378State, isa_mem_base, 0xc000000= 0), DEFINE_PROP_END_OF_LIST() }; =20 diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index b41d564..d6bcc63 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -119,6 +119,8 @@ static void raven_pcihost_realizefn(DeviceState *d, E= rror **errp) MemoryRegion *address_space_mem =3D get_system_memory(); int i; =20 + isa_mem_base =3D 0xc0000000; + for (i =3D 0; i < 4; i++) { sysbus_init_irq(dev, &s->irq[i]); } --=20 1.7.10.4