[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 39/39] pci: remove support for pre memory API BAR
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v4 39/39] pci: remove support for pre memory API BARs |
Date: |
Mon, 8 Aug 2011 16:09:32 +0300 |
Not used anymore.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/pci.c | 33 ++-------------------------------
1 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 6547d2b..dc7271a 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -848,18 +848,7 @@ static void pci_unregister_io_regions(PCIDevice *pci_dev)
r = &pci_dev->io_regions[i];
if (!r->size || r->addr == PCI_BAR_UNMAPPED)
continue;
- if (r->memory) {
- memory_region_del_subregion(r->address_space, r->memory);
- } else {
- if (r->type == PCI_BASE_ADDRESS_SPACE_IO) {
- isa_unassign_ioport(r->addr, r->filtered_size);
- } else {
- cpu_register_physical_memory(pci_to_cpu_addr(pci_dev->bus,
- r->addr),
- r->filtered_size,
- IO_MEM_UNASSIGNED);
- }
- }
+ memory_region_del_subregion(r->address_space, r->memory);
}
}
@@ -1058,25 +1047,7 @@ static void pci_update_mappings(PCIDevice *d)
/* now do the real mapping */
if (r->addr != PCI_BAR_UNMAPPED) {
- if (r->memory) {
- memory_region_del_subregion(r->address_space, r->memory);
- } else if (r->type & PCI_BASE_ADDRESS_SPACE_IO) {
- int class;
- /* NOTE: specific hack for IDE in PC case:
- only one byte must be mapped. */
- class = pci_get_word(d->config + PCI_CLASS_DEVICE);
- if (class == 0x0101 && r->size == 4) {
- isa_unassign_ioport(r->addr + 2, 1);
- } else {
- isa_unassign_ioport(r->addr, r->filtered_size);
- }
- } else {
- cpu_register_physical_memory(pci_to_cpu_addr(d->bus,
- r->addr),
- r->filtered_size,
- IO_MEM_UNASSIGNED);
- qemu_unregister_coalesced_mmio(r->addr, r->filtered_size);
- }
+ memory_region_del_subregion(r->address_space, r->memory);
}
r->addr = new_addr;
r->filtered_size = filtered_size;
--
1.7.5.3
- [Qemu-devel] [PATCH v4 33/39] msix: convert to memory API, (continued)
- [Qemu-devel] [PATCH v4 33/39] msix: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 04/39] vga: convert vga and its derivatives to the memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 25/39] ne2000: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 18/39] ide: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 06/39] cirrus: simplify bitblt BAR access functions, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 24/39] ppc: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 20/39] virtio-pci: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 38/39] pci: rename pci_register_bar_region() to pci_register_bar(), Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 39/39] pci: remove support for pre memory API BARs,
Avi Kivity <=
- [Qemu-devel] [PATCH v4 28/39] isa-mmio: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 07/39] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/08/08
- Re: [Qemu-devel] [PATCH v4 00/39] Memory API, batch 2: PCI devices, Michael S. Tsirkin, 2011/08/08
- Re: [Qemu-devel] [PATCH v4 00/39] Memory API, batch 2: PCI devices, Anthony Liguori, 2011/08/08