From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfyXS-0004HV-W0 for qemu-devel@nongnu.org; Sun, 10 Jul 2011 14:15:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QfyXM-0007dk-HL for qemu-devel@nongnu.org; Sun, 10 Jul 2011 14:15:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6193) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfyXF-0007YP-5k for qemu-devel@nongnu.org; Sun, 10 Jul 2011 14:15:18 -0400 From: Avi Kivity Date: Sun, 10 Jul 2011 21:15:05 +0300 Message-Id: <1310321709-30770-53-git-send-email-avi@redhat.com> In-Reply-To: <1310321709-30770-1-git-send-email-avi@redhat.com> References: <1310321709-30770-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [RFC v3 52/56] pci: remove pci_register_bar_simple() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Superceded by pci_register_bar_region(). Signed-off-by: Avi Kivity --- hw/pci.c | 16 ---------------- hw/pci.h | 2 -- 2 files changed, 0 insertions(+), 18 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 980840f..9db6fc8 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -923,13 +923,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 +935,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..5209964 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -204,8 +204,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