From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33272 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q6lhe-0001yq-R3 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-0001oZ-Ev for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q6lhZ-0001nn-Tg for qemu-devel@nongnu.org; Mon, 04 Apr 2011 11:28:26 -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 p34FSPHg029265 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 4 Apr 2011 11:28:25 -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 p34FSMtH016066 for ; Mon, 4 Apr 2011 11:28:24 -0400 From: Avi Kivity Date: Mon, 4 Apr 2011 18:28:06 +0300 Message-Id: <1301930887-20705-10-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 09/10] usb-ohci: 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/usb-ohci.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index d2b14f7..73d47b8 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -1713,13 +1713,6 @@ typedef struct { OHCIState state; } OHCIPCIState; -static void ohci_mapfunc(PCIDevice *pci_dev, int i, - pcibus_t addr, pcibus_t size, int type) -{ - OHCIPCIState *ohci = DO_UPCAST(OHCIPCIState, pci_dev, pci_dev); - cpu_register_physical_memory(addr, size, ohci->state.mem); -} - static int usb_ohci_initfn_pci(struct PCIDevice *dev) { OHCIPCIState *ohci = DO_UPCAST(OHCIPCIState, pci_dev, dev); @@ -1737,8 +1730,7 @@ static int usb_ohci_initfn_pci(struct PCIDevice *dev) ohci->state.irq = ohci->pci_dev.irq[0]; /* TODO: avoid cast below by using dev */ - pci_register_bar(&ohci->pci_dev, 0, 256, - PCI_BASE_ADDRESS_SPACE_MEMORY, ohci_mapfunc); + pci_register_bar_simple(&ohci->pci_dev, 0, 256, 0, ohci->state.mem); return 0; } -- 1.7.1