[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.0 1/7] raven: Rename intack region to pci_intac
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL for-2.0 1/7] raven: Rename intack region to pci_intack |
Date: |
Thu, 20 Mar 2014 00:36:00 +0100 |
From: Hervé Poussineau <address@hidden>
Regions added subsequently will also have the pci_ prefix.
Signed-off-by: Hervé Poussineau <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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 94fdffa..84d50ca 100644
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -52,9 +52,9 @@ typedef struct RavenPCIState {
typedef struct PRePPCIState {
PCIHostState parent_obj;
- MemoryRegion intack;
qemu_irq irq[PCI_NUM_PINS];
PCIBus pci_bus;
+ MemoryRegion pci_intack;
RavenPCIState pci_dev;
} PREPPCIState;
@@ -148,8 +148,9 @@ static void raven_pcihost_realizefn(DeviceState *d, Error
**errp)
memory_region_init_io(&h->mmcfg, OBJECT(s), &PPC_PCIIO_ops, s, "pciio",
0x00400000);
memory_region_add_subregion(address_space_mem, 0x80800000, &h->mmcfg);
- memory_region_init_io(&s->intack, OBJECT(s), &PPC_intack_ops, s,
"pci-intack", 1);
- memory_region_add_subregion(address_space_mem, 0xbffffff0, &s->intack);
+ 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_intack);
/* TODO Remove once realize propagates to child devices. */
object_property_set_bool(OBJECT(&s->pci_dev), true, "realized", errp);
--
1.8.4.5
- [Qemu-devel] [PULL for-2.0-rc1 0/7] PReP patch queue 2014-03-20, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 3/7] raven: Set a correct PCI I/O memory region, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 1/7] raven: Rename intack region to pci_intack,
Andreas Färber <=
- [Qemu-devel] [PULL for-2.0 4/7] raven: Set a correct PCI memory region, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 5/7] raven: Add PCI bus mastering address space, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 2/7] raven: Implement non-contiguous I/O region, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 7/7] raven: Use raven_ for all function prefixes, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 6/7] raven: Fix PCI bus accesses with size > 1, Andreas Färber, 2014/03/19
- Re: [Qemu-devel] [PULL for-2.0-rc1 0/7] PReP patch queue 2014-03-20, Peter Maydell, 2014/03/19