From patchwork Wed Aug 3 11:56:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 108286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 97B48B71DE for ; Thu, 4 Aug 2011 01:36:22 +1000 (EST) Received: from localhost ([::1]:47701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qoa4g-00011Q-Ha for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 07:57:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qoa3g-0006BH-Sm for qemu-devel@nongnu.org; Wed, 03 Aug 2011 07:56:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qoa3c-00032I-N1 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 07:56:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qoa3c-00030C-8V for qemu-devel@nongnu.org; Wed, 03 Aug 2011 07:56:16 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p73BuETp021215 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Aug 2011 07:56:14 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p73BuDxg031837; Wed, 3 Aug 2011 07:56:14 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 2E58D250B58; Wed, 3 Aug 2011 14:56:11 +0300 (IDT) From: Avi Kivity To: Anthony Liguori , qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 14:56:03 +0300 Message-Id: <1312372568-5215-34-git-send-email-avi@redhat.com> In-Reply-To: <1312372568-5215-1-git-send-email-avi@redhat.com> References: <1312372568-5215-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v2 33/38] pci: remove pci_register_bar_simple() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Reviewed-by: Richard Henderson 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);