[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 36/38] pci: fold BAR mapping function into its ca
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 36/38] pci: fold BAR mapping function into its caller |
Date: |
Wed, 3 Aug 2011 14:56:06 +0300 |
There is only one function, so no need for a function pointer.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/pci.c | 25 +++++++++----------------
hw/pci.h | 1 -
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index e9e4874..e6a759a 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -881,18 +881,6 @@ static int pci_unregister_device(DeviceState *dev)
return 0;
}
-static void pci_simple_bar_mapfunc_region(PCIDevice *pci_dev, int region_num,
- pcibus_t addr, pcibus_t size,
- int type)
-{
- PCIIORegion *r = &pci_dev->io_regions[region_num];
-
- memory_region_add_subregion_overlap(r->address_space,
- addr,
- r->memory,
- 1);
-}
-
void pci_register_bar_region(PCIDevice *pci_dev, int region_num,
uint8_t type, MemoryRegion *memory)
{
@@ -914,7 +902,6 @@ void pci_register_bar_region(PCIDevice *pci_dev, int
region_num,
r->size = size;
r->filtered_size = size;
r->type = type;
- r->map_func = pci_simple_bar_mapfunc_region;
r->memory = NULL;
wmask = ~(size - 1);
@@ -1102,10 +1089,16 @@ static void pci_update_mappings(PCIDevice *d)
* addr & (size - 1) != 0.
*/
if (r->type & PCI_BASE_ADDRESS_SPACE_IO) {
- r->map_func(d, i, r->addr, r->filtered_size, r->type);
+ memory_region_add_subregion_overlap(r->address_space,
+ r->addr,
+ r->memory,
+ 1);
} else {
- r->map_func(d, i, pci_to_cpu_addr(d->bus, r->addr),
- r->filtered_size, r->type);
+ memory_region_add_subregion_overlap(r->address_space,
+ pci_to_cpu_addr(d->bus,
+ r->addr),
+ r->memory,
+ 1);
}
}
}
diff --git a/hw/pci.h b/hw/pci.h
index 8028176..8d1662a 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -92,7 +92,6 @@ typedef struct PCIIORegion {
pcibus_t size;
pcibus_t filtered_size;
uint8_t type;
- PCIMapIORegionFunc *map_func;
MemoryRegion *memory;
MemoryRegion *address_space;
} PCIIORegion;
--
1.7.5.3
- [Qemu-devel] [PATCH v2 00/38] Memory API, batch 2: PCI devices, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 01/38] pci: add API to get a BAR's mapped address, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 04/38] cirrus: simplify mmio BAR access functions, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 20/38] ahci: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 33/38] pci: remove pci_register_bar_simple(), Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 22/38] lsi53c895a: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 02/38] vmsvga: don't remember pci BAR address in callback any more, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 13/38] ac97: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 29/38] ehci: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 05/38] cirrus: simplify bitblt BAR access functions, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 36/38] pci: fold BAR mapping function into its caller,
Avi Kivity <=
- [Qemu-devel] [PATCH v2 31/38] xen-platform: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 18/38] ivshmem: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 03/38] vga: convert vga and its derivatives to the memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 10/38] pci: pass I/O address space to new PCI bus, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 07/38] vga: simplify vga window mmio access functions, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 15/38] eepro100: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 09/38] Integrate I/O memory regions into qemu, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 08/38] cirrus: simplify linear framebuffer access functions, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 14/38] e1000: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 30/38] uhci: convert to memory API, Avi Kivity, 2011/08/03