Commit eedfac6f authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw/n*: pass owner to memory_region_init* functions 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3c161542

hw/net/cadence_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -1163,7 +1163,8 @@ static int gem_init(SysBusDevice *dev) 


    s = FROM_SYSBUS(GemState, dev);

    gem_init_register_masks(s);

    memory_region_init_io(&s->iomem, NULL, &gem_ops, s, "enet", sizeof(s->regs));

    memory_region_init_io(&s->iomem, OBJECT(s), &gem_ops, s,

                          "enet", sizeof(s->regs));

    sysbus_init_mmio(dev, &s->iomem);

    sysbus_init_irq(dev, &s->irq);

    qemu_macaddr_default_if_unset(&s->conf.macaddr);

hw/net/e1000.c

+3 −3
Original line number Diff line number Diff line
@@ -1276,13 +1276,13 @@ e1000_mmio_setup(E1000State *d) 
        E1000_IMC, E1000_TCTL, E1000_TDT, PNPMMIO_SIZE

    };



    memory_region_init_io(&d->mmio, NULL, &e1000_mmio_ops, d, "e1000-mmio",

                          PNPMMIO_SIZE);

    memory_region_init_io(&d->mmio, OBJECT(d), &e1000_mmio_ops, d,

                          "e1000-mmio", PNPMMIO_SIZE);

    memory_region_add_coalescing(&d->mmio, 0, excluded_regs[0]);

    for (i = 0; excluded_regs[i] != PNPMMIO_SIZE; i++)

        memory_region_add_coalescing(&d->mmio, excluded_regs[i] + 4,

                                     excluded_regs[i+1] - excluded_regs[i] - 4);

    memory_region_init_io(&d->io, NULL, &e1000_io_ops, d, "e1000-io", IOPORT_SIZE);

    memory_region_init_io(&d->io, OBJECT(d), &e1000_io_ops, d, "e1000-io", IOPORT_SIZE);

}



static void

hw/net/eepro100.c

+6 −6
Original line number Diff line number Diff line
@@ -1876,15 +1876,15 @@ static int e100_nic_init(PCIDevice *pci_dev) 
    s->eeprom = eeprom93xx_new(&pci_dev->qdev, EEPROM_SIZE);



    /* Handler for memory-mapped I/O */

    memory_region_init_io(&s->mmio_bar, NULL, &eepro100_ops, s, "eepro100-mmio",

                          PCI_MEM_SIZE);

    memory_region_init_io(&s->mmio_bar, OBJECT(s), &eepro100_ops, s,

                          "eepro100-mmio", PCI_MEM_SIZE);

    pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->mmio_bar);

    memory_region_init_io(&s->io_bar, NULL, &eepro100_ops, s, "eepro100-io",

                          PCI_IO_SIZE);

    memory_region_init_io(&s->io_bar, OBJECT(s), &eepro100_ops, s,

                          "eepro100-io", PCI_IO_SIZE);

    pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io_bar);

    /* FIXME: flash aliases to mmio?! */

    memory_region_init_io(&s->flash_bar, NULL, &eepro100_ops, s, "eepro100-flash",

                          PCI_FLASH_SIZE);

    memory_region_init_io(&s->flash_bar, OBJECT(s), &eepro100_ops, s,

                          "eepro100-flash", PCI_FLASH_SIZE);

    pci_register_bar(&s->dev, 2, 0, &s->flash_bar);



    qemu_macaddr_default_if_unset(&s->conf.macaddr);

hw/net/etraxfs_eth.c

+2 −1
Original line number Diff line number Diff line
@@ -610,7 +610,8 @@ static int fs_eth_init(SysBusDevice *dev) 
    s->dma_in->client.opaque = s;

    s->dma_in->client.pull = NULL;



    memory_region_init_io(&s->mmio, NULL, &eth_ops, s, "etraxfs-eth", 0x5c);

    memory_region_init_io(&s->mmio, OBJECT(dev), &eth_ops, s,

                          "etraxfs-eth", 0x5c);

    sysbus_init_mmio(dev, &s->mmio);



    qemu_macaddr_default_if_unset(&s->conf.macaddr);

hw/net/lan9118.c

+2 −1
Original line number Diff line number Diff line
@@ -1328,7 +1328,8 @@ static int lan9118_init1(SysBusDevice *dev) 
    const MemoryRegionOps *mem_ops =

            s->mode_16bit ? &lan9118_16bit_mem_ops : &lan9118_mem_ops;



    memory_region_init_io(&s->mmio, NULL, mem_ops, s, "lan9118-mmio", 0x100);

    memory_region_init_io(&s->mmio, OBJECT(dev), mem_ops, s,

                          "lan9118-mmio", 0x100);

    sysbus_init_mmio(dev, &s->mmio);

    sysbus_init_irq(dev, &s->irq);

    qemu_macaddr_default_if_unset(&s->conf.macaddr);