From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvV1v-00022K-DC for qemu-devel@nongnu.org; Mon, 22 Aug 2011 09:59:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QvV1o-00023X-Lj for qemu-devel@nongnu.org; Mon, 22 Aug 2011 09:59:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52949) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvV1o-00023O-DS for qemu-devel@nongnu.org; Mon, 22 Aug 2011 09:59:00 -0400 From: Avi Kivity Date: Mon, 22 Aug 2011 16:58:54 +0300 Message-Id: <1314021534-3212-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH] pcnet-pci: fix wrong opaque given to I/O accessors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerhard Wiesinger , Anthony Liguori , qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Another casualty of the memory API conversion. Signed-off-by: Avi Kivity --- hw/pcnet-pci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index 13d9380..51e1320 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -290,10 +290,10 @@ static int pci_pcnet_init(PCIDevice *pci_dev) pci_conf[PCI_MAX_LAT] = 0xff; /* Handler for memory-mapped I/O */ - memory_region_init_io(&d->state.mmio, &pcnet_mmio_ops, d, "pcnet-mmio", + memory_region_init_io(&d->state.mmio, &pcnet_mmio_ops, s, "pcnet-mmio", PCNET_PNPMMIO_SIZE); - memory_region_init_io(&d->io_bar, &pcnet_io_ops, d, "pcnet-io", + memory_region_init_io(&d->io_bar, &pcnet_io_ops, s, "pcnet-io", PCNET_IOPORT_SIZE); pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &d->io_bar); -- 1.7.5.3