From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33218 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q6lhc-0001yH-5S for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q6lhY-0001nH-L9 for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q6lhY-0001mj-9N for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:24 -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 p34FSNhl002052 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 4 Apr 2011 11:28:23 -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 p34FSM8i009709 for ; Mon, 4 Apr 2011 11:28:23 -0400 From: Avi Kivity Date: Mon, 4 Apr 2011 18:28:00 +0300 Message-Id: <1301930887-20705-4-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 03/10] cirrus-vga: 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/cirrus_vga.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 2724f7b..ff78335 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3076,15 +3076,6 @@ static void cirrus_pci_lfb_map(PCIDevice *d, int region_num, vga_dirty_log_start(&s->vga); } -static void cirrus_pci_mmio_map(PCIDevice *d, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - CirrusVGAState *s = &DO_UPCAST(PCICirrusVGAState, dev, d)->cirrus_vga; - - cpu_register_physical_memory(addr, CIRRUS_PNPMMIO_SIZE, - s->cirrus_mmio_io_addr); -} - static void pci_cirrus_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len) { @@ -3123,8 +3114,8 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) pci_register_bar(&d->dev, 0, 0x2000000, PCI_BASE_ADDRESS_MEM_PREFETCH, cirrus_pci_lfb_map); if (device_id == CIRRUS_ID_CLGD5446) { - pci_register_bar(&d->dev, 1, CIRRUS_PNPMMIO_SIZE, - PCI_BASE_ADDRESS_SPACE_MEMORY, cirrus_pci_mmio_map); + pci_register_bar_simple(&d->dev, 1, CIRRUS_PNPMMIO_SIZE, 0, + s->cirrus_mmio_io_addr); } return 0; } -- 1.7.1