[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 34/39] pci: remove pci_register_bar_simple()
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 34/39] pci: remove pci_register_bar_simple() |
Date: |
Sun, 31 Jul 2011 20:57:57 +0300 |
Superceded by pci_register_bar_region().
---
hw/pci.c | 17 -----------------
hw/pci.h | 3 ---
2 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 980840f..6aca1af 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -903,7 +903,6 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
r->filtered_size = size;
r->type = type;
r->map_func = map_func;
- r->ram_addr = IO_MEM_UNASSIGNED;
r->memory = NULL;
wmask = ~(size - 1);
@@ -923,13 +922,6 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
}
}
-static void pci_simple_bar_mapfunc(PCIDevice *pci_dev, int region_num,
- pcibus_t addr, pcibus_t size, int type)
-{
- cpu_register_physical_memory(addr, size,
- pci_dev->io_regions[region_num].ram_addr);
-}
-
static void pci_simple_bar_mapfunc_region(PCIDevice *pci_dev, int region_num,
pcibus_t addr, pcibus_t size,
int type)
@@ -942,15 +934,6 @@ static void pci_simple_bar_mapfunc_region(PCIDevice
*pci_dev, int region_num,
1);
}
-void pci_register_bar_simple(PCIDevice *pci_dev, int region_num,
- pcibus_t size, uint8_t attr, ram_addr_t ram_addr)
-{
- pci_register_bar(pci_dev, region_num, size,
- PCI_BASE_ADDRESS_SPACE_MEMORY | attr,
- pci_simple_bar_mapfunc);
- pci_dev->io_regions[region_num].ram_addr = ram_addr;
-}
-
void pci_register_bar_region(PCIDevice *pci_dev, int region_num,
uint8_t attr, MemoryRegion *memory)
{
diff --git a/hw/pci.h b/hw/pci.h
index a95e2ad..25e28b1 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -93,7 +93,6 @@ typedef struct PCIIORegion {
pcibus_t filtered_size;
uint8_t type;
PCIMapIORegionFunc *map_func;
- ram_addr_t ram_addr;
MemoryRegion *memory;
MemoryRegion *address_space;
} PCIIORegion;
@@ -204,8 +203,6 @@ PCIDevice *pci_register_device(PCIBus *bus, const char
*name,
void pci_register_bar(PCIDevice *pci_dev, int region_num,
pcibus_t size, uint8_t type,
PCIMapIORegionFunc *map_func);
-void pci_register_bar_simple(PCIDevice *pci_dev, int region_num,
- pcibus_t size, uint8_t attr, ram_addr_t ram_addr);
void pci_register_bar_region(PCIDevice *pci_dev, int region_num,
uint8_t attr, MemoryRegion *memory);
pcibus_t pci_get_bar_addr(PCIDevice *pci_dev, int region_num);
--
1.7.5.3
- [Qemu-devel] [PATCH 06/39] cirrus: simplify vga window mmio access functions, (continued)
- [Qemu-devel] [PATCH 06/39] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 16/39] eepro100: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 20/39] virtio-pci: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 19/39] ivshmem: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 37/39] pci: fold BAR mapping function into its caller, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 18/39] ide: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 11/39] pci: pass I/O address space to new PCI bus, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 29/39] sun4u: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 14/39] ac97: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 32/39] xen-platform: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 34/39] pci: remove pci_register_bar_simple(),
Avi Kivity <=
- [Qemu-devel] [PATCH 07/39] vga: simplify vga window mmio access functions, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 33/39] msix: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 23/39] lsi53c895a: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 17/39] es1370: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 26/39] pcnet: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 35/39] pci: convert pci rom to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 24/39] ppc: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 38/39] pci: rename pci_register_bar_region() to pci_register_bar(), Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 28/39] isa-mmio: concert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 03/39] vga: convert vga and its derivatives to the memory API, Avi Kivity, 2011/07/31