[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 37/66] ne2000: pass device to ne2000_setup_io, use i
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 37/66] ne2000: pass device to ne2000_setup_io, use it as owner |
Date: |
Thu, 4 Jul 2013 17:13:33 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/net/ne2000-isa.c | 2 +-
hw/net/ne2000.c | 6 +++---
hw/net/ne2000.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index 9232abd..e3c8076 100644
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -72,7 +72,7 @@ static void isa_ne2000_realizefn(DeviceState *dev, Error
**errp)
ISANE2000State *isa = ISA_NE2000(dev);
NE2000State *s = &isa->ne2000;
- ne2000_setup_io(s, 0x20);
+ ne2000_setup_io(s, DEVICE(isadev), 0x20);
isa_register_ioport(isadev, &s->io, isa->iobase);
isa_init_irq(isadev, &s->irq, isa->isairq);
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index 00940af..8d43fd9 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -699,9 +699,9 @@ static const MemoryRegionOps ne2000_ops = {
/***********************************************************/
/* PCI NE2000 definitions */
-void ne2000_setup_io(NE2000State *s, unsigned size)
+void ne2000_setup_io(NE2000State *s, DeviceState *dev, unsigned size)
{
- memory_region_init_io(&s->io, NULL, &ne2000_ops, s, "ne2000", size);
+ memory_region_init_io(&s->io, OBJECT(dev), &ne2000_ops, s, "ne2000", size);
}
static void ne2000_cleanup(NetClientState *nc)
@@ -729,7 +729,7 @@ static int pci_ne2000_init(PCIDevice *pci_dev)
pci_conf[PCI_INTERRUPT_PIN] = 1; /* interrupt pin A */
s = &d->ne2000;
- ne2000_setup_io(s, 0x100);
+ ne2000_setup_io(s, DEVICE(pci_dev), 0x100);
pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io);
s->irq = d->dev.irq[0];
diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h
index b31ae03..e500306 100644
--- a/hw/net/ne2000.h
+++ b/hw/net/ne2000.h
@@ -31,7 +31,7 @@ typedef struct NE2000State {
uint8_t mem[NE2000_MEM_SIZE];
} NE2000State;
-void ne2000_setup_io(NE2000State *s, unsigned size);
+void ne2000_setup_io(NE2000State *s, DeviceState *dev, unsigned size);
extern const VMStateDescription vmstate_ne2000;
void ne2000_reset(NE2000State *s);
int ne2000_can_receive(NetClientState *nc);
--
1.8.1.4
- [Qemu-devel] [PATCH 28/66] exec: reorganize address_space_map, (continued)
- [Qemu-devel] [PATCH 28/66] exec: reorganize address_space_map, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 29/66] memory: ref/unref memory across address_space_map/unmap, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 30/66] escc: rename struct to ESCCState, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 31/66] vga: pass owner to vga_init, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 32/66] vga: pass owner to vga_common_init, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 33/66] vga: pass owner to cirrus_init_common, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 34/66] vga: pass owner to vga_init_vbe, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 35/66] vga: pass owner to vga_init_io, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 36/66] vga: set owner in vga_update_memory_access, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 37/66] ne2000: pass device to ne2000_setup_io, use it as owner,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 38/66] vfio: pass device to vfio_mmap_bar and use it to set owner, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 39/66] spapr_iommu: pass device to spapr_tce_new_table and use it to set owner, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 40/66] pam: pass device to init_pam and use it to set owner, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 41/66] piolist: add owner argument to initialization functions and pass devices, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 43/66] hw/block: pass owner to memory_region_init* functions, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 44/66] hw/c*: pass owner to memory_region_init* functions, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 42/66] hw/a*: pass owner to memory_region_init* functions, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 45/66] hw/d*: pass owner to memory_region_init* functions, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 46/66] hw/gpio: pass owner to memory_region_init* functions, Paolo Bonzini, 2013/07/04
- [Qemu-devel] [PATCH 47/66] hw/i*: pass owner to memory_region_init* functions, Paolo Bonzini, 2013/07/04