From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33263 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q6lhf-0001yi-Hr for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q6lha-0001oI-3d for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q6lhZ-0001nj-Q3 for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:26 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p34FSOMF025592 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 4 Apr 2011 11:28:24 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p34FSM8m009709 for ; Mon, 4 Apr 2011 11:28:24 -0400 From: Avi Kivity Date: Mon, 4 Apr 2011 18:28:05 +0300 Message-Id: <1301930887-20705-9-git-send-email-avi@redhat.com> In-Reply-To: <1301930887-20705-1-git-send-email-avi@redhat.com> References: <1301930887-20705-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 08/10] pcnet-pci: convert to pci_register_bar_simple() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org Signed-off-by: Avi Kivity --- hw/pcnet-pci.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index 339a401..4ac3e32 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -214,19 +214,6 @@ static CPUReadMemoryFunc * const pcnet_mmio_read[] = { &pcnet_mmio_readl }; -static void pcnet_mmio_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, pci_dev); - -#ifdef PCNET_DEBUG_IO - printf("pcnet_mmio_map addr=0x%08"FMT_PCIBUS" 0x%08"FMT_PCIBUS"\n", - addr, size); -#endif - - cpu_register_physical_memory(addr, PCNET_PNPMMIO_SIZE, d->state.mmio_index); -} - static void pci_physical_memory_write(void *dma_opaque, target_phys_addr_t addr, uint8_t *buf, int len, int do_bswap) { @@ -300,8 +287,7 @@ static int pci_pcnet_init(PCIDevice *pci_dev) pci_register_bar(pci_dev, 0, PCNET_IOPORT_SIZE, PCI_BASE_ADDRESS_SPACE_IO, pcnet_ioport_map); - pci_register_bar(pci_dev, 1, PCNET_PNPMMIO_SIZE, - PCI_BASE_ADDRESS_SPACE_MEMORY, pcnet_mmio_map); + pci_register_bar_simple(pci_dev, 1, PCNET_PNPMMIO_SIZE, 0, s->mmio_index); s->irq = pci_dev->irq[0]; s->phys_mem_read = pci_physical_memory_read; -- 1.7.1