aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHervé Poussineau <hpoussin@reactos.org>2011-08-20 16:29:50 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2011-08-22 10:20:10 -0500
commit145aebeca442f608353cc1dd8d48f5a11faca71e (patch)
tree3c9afeda190bef107d50e29b221f6e93186c86f8
parent3f53458137b6154acfa5bfe05efe8bd67f6d1778 (diff)
downloadqemu-145aebeca442f608353cc1dd8d48f5a11faca71e.zip
qemu-145aebeca442f608353cc1dd8d48f5a11faca71e.tar.gz
qemu-145aebeca442f608353cc1dd8d48f5a11faca71e.tar.bz2
pcnet: fix wrong opaque (broken by bd8d6f7cadb6ace98c779135217a4ed7b5fccc23)
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/pcnet-pci.c4
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);