summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/pci/pci.c26
-rw-r--r--include/hw/pci/pci_bus.h1
2 files changed, 0 insertions, 27 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index a98c8a0580..ed32059bf8 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -283,24 +283,6 @@ const char *pci_root_bus_path(PCIDevice *dev)
return rootbus->qbus.name;
}
-static uint64_t master_abort_mem_read(void *opaque, hwaddr addr, unsigned size)
-{
- return -1ULL;
-}
-
-static void master_abort_mem_write(void *opaque, hwaddr addr, uint64_t val,
- unsigned size)
-{
-}
-
-static const MemoryRegionOps master_abort_mem_ops = {
- .read = master_abort_mem_read,
- .write = master_abort_mem_write,
- .endianness = DEVICE_LITTLE_ENDIAN,
-};
-
-#define MASTER_ABORT_MEM_PRIORITY INT_MIN
-
static void pci_bus_init(PCIBus *bus, DeviceState *parent,
const char *name,
MemoryRegion *address_space_mem,
@@ -312,14 +294,6 @@ static void pci_bus_init(PCIBus *bus, DeviceState *parent,
bus->address_space_mem = address_space_mem;
bus->address_space_io = address_space_io;
-
- memory_region_init_io(&bus->master_abort_mem, OBJECT(bus),
- &master_abort_mem_ops, bus, "pci-master-abort",
- memory_region_size(bus->address_space_mem));
- memory_region_add_subregion_overlap(bus->address_space_mem,
- 0, &bus->master_abort_mem,
- MASTER_ABORT_MEM_PRIORITY);
-
/* host bridge */
QLIST_INIT(&bus->child);
diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h
index 2ad5edbde9..9df17885ec 100644
--- a/include/hw/pci/pci_bus.h
+++ b/include/hw/pci/pci_bus.h
@@ -23,7 +23,6 @@ struct PCIBus {
PCIDevice *parent_dev;
MemoryRegion *address_space_mem;
MemoryRegion *address_space_io;
- MemoryRegion master_abort_mem;
QLIST_HEAD(, PCIBus) child; /* this will be replaced by qdev later */
QLIST_ENTRY(PCIBus) sibling;/* this will be replaced by qdev later */