[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v5 56/86] pci: remove pci_register_bar_simple()
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v5 56/86] pci: remove pci_register_bar_simple() |
Date: |
Wed, 20 Jul 2011 19:50:06 +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] [RFC v5 37/86] e1000: convert to memory API, (continued)
- [Qemu-devel] [RFC v5 37/86] e1000: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 02/86] Hierarchical memory region API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 41/86] ivshmem: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 82/86] sysbus: remove sysbus_init_mmio_cb(), Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 70/86] tusb6010: move declarations to new file tusb6010.h, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 17/86] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 07/86] memory: rename MemoryRegion::has_ram_addr to ::terminates, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 48/86] pcnet: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 09/86] memory: I/O address space support, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 43/86] ahci: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 56/86] pci: remove pci_register_bar_simple(),
Avi Kivity <=
- [Qemu-devel] [RFC v5 28/86] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 47/86] ne2000: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 58/86] pci: remove pci_register_bar(), Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 29/86] vga: simplify vga window mmio access functions, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 05/86] Internal interfaces for memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 79/86] arm11mpcore: use sysbus_init_mmio_cb2, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 67/86] arm_timer: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 10/86] memory: add backward compatibility for old portio registration, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 53/86] uhci: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 59/86] pci: fold BAR mapping function into its caller, Avi Kivity, 2011/07/20