From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33259 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q6lhh-0001ye-Ua for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q6lhZ-0001o8-RS for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41011) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q6lhZ-0001nZ-Gf for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:25 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p34FSOmp007483 (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-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p34FSOxJ008777 for ; Mon, 4 Apr 2011 11:28:24 -0400 From: Avi Kivity Date: Mon, 4 Apr 2011 18:28:03 +0300 Message-Id: <1301930887-20705-7-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 06/10] hda-intel: 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/intel-hda.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/hw/intel-hda.c b/hw/intel-hda.c index b0b1d12..7f83745 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -1109,14 +1109,6 @@ static CPUWriteMemoryFunc * const intel_hda_mmio_write[3] = { intel_hda_mmio_writel, }; -static void intel_hda_map(PCIDevice *pci, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci); - - cpu_register_physical_memory(addr, 0x4000, d->mmio_addr); -} - /* --------------------------------------------------------------------- */ static void intel_hda_reset(DeviceState *dev) @@ -1158,8 +1150,7 @@ static int intel_hda_init(PCIDevice *pci) d->mmio_addr = cpu_register_io_memory(intel_hda_mmio_read, intel_hda_mmio_write, d, DEVICE_NATIVE_ENDIAN); - pci_register_bar(&d->pci, 0, 0x4000, PCI_BASE_ADDRESS_SPACE_MEMORY, - intel_hda_map); + pci_register_bar_simple(&d->pci, 0, 0x4000, 0, d->mmio_addr); if (d->msi) { msi_init(&d->pci, 0x50, 1, true, false); } -- 1.7.1