From patchwork Wed Jul 31 21:28:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 263885 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 17A4B2C00C1 for ; Thu, 1 Aug 2013 13:21:21 +1000 (EST) Received: from localhost ([::1]:52779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4jS2-00023l-Af for incoming@patchwork.ozlabs.org; Wed, 31 Jul 2013 23:21:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4jRg-00022Y-QN for qemu-devel@nongnu.org; Wed, 31 Jul 2013 23:21:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4ijV-0002YE-56 for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:35:23 -0400 Received: from mout.web.de ([212.227.17.12]:55314) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4dwH-0007GL-5V for qemu-devel@nongnu.org; Wed, 31 Jul 2013 17:28:09 -0400 Received: from localhost.localdomain ([84.148.2.14]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MeSKR-1Uhv3o3RKp-00Q8cr for ; Wed, 31 Jul 2013 23:28:08 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2013 23:28:00 +0200 Message-Id: <1375306081-9234-2-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1375306081-9234-1-git-send-email-andreas.faerber@web.de> References: <1375306081-9234-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:WKOp3m0ps25N8lsgxvdb5/Imk6SJHwMLxct36Tc+rKJ2h88JNTT O4AE29jBqRmdP43mwnO3i9c4JK/iMOvnzcoPUjBal5mch/uh6k8Y/8S3KwP4B6Flg83iFAQ VhvbHwXo+hf1q2PoQADOWo9PCJx+3TZTulv0C2gQnRYwROrjH1HJMIHt3BEQoxQm8CSFEna PFLd4AjYJ4x6xu2cBYbnA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.17.12 Cc: "open list:PReP" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, anthony@codemonkey.ws Subject: [Qemu-devel] [PULL 1/2] pci-host/prep: Set isa_mem_base in the PCI host bridge X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Hervé Poussineau Currently, it is done by i82378 PCI-ISA bridge, which shouldn't care about it. Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber --- 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 a542134..9b8674a 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; @@ -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); - isa_mem_base = pci->isa_mem_base; isa_bus_new(&dev->qdev, pci_address_space_io(dev)); i82378_init(&dev->qdev, s); @@ -244,7 +242,6 @@ static int pci_i82378_init(PCIDevice *dev) static Property i82378_properties[] = { DEFINE_PROP_HEX32("iobase", PCIi82378State, isa_io_base, 0x80000000), - DEFINE_PROP_HEX32("membase", PCIi82378State, isa_mem_base, 0xc0000000), DEFINE_PROP_END_OF_LIST() }; diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 09d3b32..e120058 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -119,6 +119,8 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) MemoryRegion *address_space_mem = get_system_memory(); int i; + isa_mem_base = 0xc0000000; + for (i = 0; i < 4; i++) { sysbus_init_irq(dev, &s->irq[i]); }