From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrU1u-0004RR-4E for qemu-devel@nongnu.org; Tue, 25 Jun 2013 10:15:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UrU1p-0002qo-D9 for qemu-devel@nongnu.org; Tue, 25 Jun 2013 10:15:34 -0400 Received: from mail-ea0-x234.google.com ([2a00:1450:4013:c01::234]:46971) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrU1p-0002qh-6h for qemu-devel@nongnu.org; Tue, 25 Jun 2013 10:15:29 -0400 Received: by mail-ea0-f180.google.com with SMTP id k10so6845331eaj.39 for ; Tue, 25 Jun 2013 07:15:28 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 25 Jun 2013 16:14:49 +0200 Message-Id: <1372169705-7645-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1372169705-7645-1-git-send-email-pbonzini@redhat.com> References: <1372169705-7645-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/24] ne2000: pass device to ne2000_setup_io, use it as owner List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, alex.williamson@redhat.com Signed-off-by: Paolo Bonzini --- 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