From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdTGO-00045K-SF for qemu-devel@nongnu.org; Mon, 04 Nov 2013 18:08:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdTGJ-00046E-8F for qemu-devel@nongnu.org; Mon, 04 Nov 2013 18:08:52 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Tue, 5 Nov 2013 00:09:46 +0100 Message-Id: <1383606592-12783-5-git-send-email-hpoussin@reactos.org> In-Reply-To: <1383606592-12783-1-git-send-email-hpoussin@reactos.org> References: <1383606592-12783-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 v3 04/10] raven: rename intack region to pci_intack 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 Regions added in next patches will also have the pci_ prefix. Signed-off-by: Herv=C3=A9 Poussineau --- hw/pci-host/prep.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 4dc5456..aaf5818 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -51,9 +51,9 @@ typedef struct RavenPCIState { typedef struct PRePPCIState { PCIHostState parent_obj; =20 - MemoryRegion intack; qemu_irq irq[PCI_NUM_PINS]; PCIBus pci_bus; + MemoryRegion pci_intack; RavenPCIState pci_dev; } PREPPCIState; =20 @@ -147,8 +147,9 @@ static void raven_pcihost_realizefn(DeviceState *d, E= rror **errp) memory_region_init_io(&h->mmcfg, OBJECT(s), &PPC_PCIIO_ops, s, "pcii= o", 0x00400000); memory_region_add_subregion(address_space_mem, 0x80800000, &h->mmcfg= ); =20 - memory_region_init_io(&s->intack, OBJECT(s), &PPC_intack_ops, s, "pc= i-intack", 1); - memory_region_add_subregion(address_space_mem, 0xbffffff0, &s->intac= k); + memory_region_init_io(&s->pci_intack, OBJECT(s), &PPC_intack_ops, s, + "pci-intack", 1); + memory_region_add_subregion(address_space_mem, 0xbffffff0, &s->pci_i= ntack); =20 /* TODO Remove once realize propagates to child devices. */ object_property_set_bool(OBJECT(&s->pci_dev), true, "realized", errp= ); --=20 1.7.10.4