From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [RFC v4 54/58] pci: remove pci_register_bar_simple() Date: Sun, 17 Jul 2011 14:14:21 +0300 Message-ID: <1310901265-32051-55-git-send-email-avi@redhat.com> References: <1310901265-32051-1-git-send-email-avi@redhat.com> Cc: kvm@vger.kernel.org To: qemu-devel@nongnu.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:23308 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755855Ab1GQLOd (ORCPT ); Sun, 17 Jul 2011 07:14:33 -0400 In-Reply-To: <1310901265-32051-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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