From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33258 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q6lhh-0001yd-Uc for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q6lhZ-0001nt-I1 for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q6lhZ-0001nP-7a for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:25 -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 p34FSO7L029257 (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-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p34FSMtF016066 for ; Mon, 4 Apr 2011 11:28:24 -0400 From: Avi Kivity Date: Mon, 4 Apr 2011 18:28:04 +0300 Message-Id: <1301930887-20705-8-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 07/10] hda-intel: convert to pci_register_bar_simple() (partial) 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/lsi53c895a.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index e4b51a8..be4df58 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -2094,15 +2094,6 @@ static void lsi_ram_mapfunc(PCIDevice *pci_dev, int region_num, cpu_register_physical_memory(addr + 0, 0x2000, s->ram_io_addr); } -static void lsi_mmio_mapfunc(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - LSIState *s = DO_UPCAST(LSIState, dev, pci_dev); - - DPRINTF("Mapping registers at %08"FMT_PCIBUS"\n", addr); - cpu_register_physical_memory(addr + 0, 0x400, s->mmio_io_addr); -} - static void lsi_scsi_reset(DeviceState *dev) { LSIState *s = DO_UPCAST(LSIState, dev.qdev, dev); @@ -2245,8 +2236,7 @@ static int lsi_scsi_init(PCIDevice *dev) pci_register_bar(&s->dev, 0, 256, PCI_BASE_ADDRESS_SPACE_IO, lsi_io_mapfunc); - pci_register_bar(&s->dev, 1, 0x400, - PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_mmio_mapfunc); + pci_register_bar_simple(&s->dev, 1, 0x400, 0, s->mmio_io_addr); pci_register_bar(&s->dev, 2, 0x2000, PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_ram_mapfunc); QTAILQ_INIT(&s->queue); -- 1.7.1