Commit 22fc860b authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

hw/[u-x]*: pass owner to memory_region_init* functions 



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

hw/usb/hcd-ehci-sysbus.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static void fusbh200_ehci_init(Object *obj) 
    FUSBH200EHCIState *f = FUSBH200_EHCI(obj);

    EHCIState *s = &i->ehci;



    memory_region_init_io(&f->mem_vendor, NULL, &fusbh200_ehci_mmio_ops, s,

    memory_region_init_io(&f->mem_vendor, OBJECT(f), &fusbh200_ehci_mmio_ops, s,

                          "fusbh200", 0x4c);

    memory_region_add_subregion(&s->mem,

                                s->opregbase + s->portscbase + 4 * s->portnr,

hw/usb/hcd-ehci.c

+4 −4
Original line number Diff line number Diff line
@@ -2553,12 +2553,12 @@ void usb_ehci_init(EHCIState *s, DeviceState *dev) 
    QTAILQ_INIT(&s->pqueues);

    usb_packet_init(&s->ipacket);



    memory_region_init(&s->mem, NULL, "ehci", MMIO_SIZE);

    memory_region_init_io(&s->mem_caps, NULL, &ehci_mmio_caps_ops, s,

    memory_region_init(&s->mem, OBJECT(dev), "ehci", MMIO_SIZE);

    memory_region_init_io(&s->mem_caps, OBJECT(dev), &ehci_mmio_caps_ops, s,

                          "capabilities", CAPA_SIZE);

    memory_region_init_io(&s->mem_opreg, NULL, &ehci_mmio_opreg_ops, s,

    memory_region_init_io(&s->mem_opreg, OBJECT(dev), &ehci_mmio_opreg_ops, s,

                          "operational", s->portscbase);

    memory_region_init_io(&s->mem_ports, NULL, &ehci_mmio_port_ops, s,

    memory_region_init_io(&s->mem_ports, OBJECT(dev), &ehci_mmio_port_ops, s,

                          "ports", 4 * s->portnr);



    memory_region_add_subregion(&s->mem, s->capsbase, &s->mem_caps);

hw/usb/hcd-ohci.c

+2 −1
Original line number Diff line number Diff line
@@ -1830,7 +1830,8 @@ static int usb_ohci_init(OHCIState *ohci, DeviceState *dev, 
        }

    }



    memory_region_init_io(&ohci->mem, NULL, &ohci_mem_ops, ohci, "ohci", 256);

    memory_region_init_io(&ohci->mem, OBJECT(dev), &ohci_mem_ops,

                          ohci, "ohci", 256);

    ohci->localmem_base = localmem_base;



    ohci->name = object_get_typename(OBJECT(dev));

hw/usb/hcd-uhci.c

+3 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,9 @@ static int usb_uhci_common_initfn(PCIDevice *dev) 


    qemu_register_reset(uhci_reset, s);



    memory_region_init_io(&s->io_bar, NULL, &uhci_ioport_ops, s, "uhci", 0x20);

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

                          "uhci", 0x20);



    /* Use region 4 for consistency with real hardware.  BSD guests seem

       to rely on this.  */

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

hw/usb/hcd-xhci.c

+6 −6
Original line number Diff line number Diff line
@@ -3342,14 +3342,14 @@ static int usb_xhci_initfn(struct PCIDevice *dev) 


    xhci->irq = xhci->pci_dev.irq[0];



    memory_region_init(&xhci->mem, NULL, "xhci", LEN_REGS);

    memory_region_init_io(&xhci->mem_cap, NULL, &xhci_cap_ops, xhci,

    memory_region_init(&xhci->mem, OBJECT(xhci), "xhci", LEN_REGS);

    memory_region_init_io(&xhci->mem_cap, OBJECT(xhci), &xhci_cap_ops, xhci,

                          "capabilities", LEN_CAP);

    memory_region_init_io(&xhci->mem_oper, NULL, &xhci_oper_ops, xhci,

    memory_region_init_io(&xhci->mem_oper, OBJECT(xhci), &xhci_oper_ops, xhci,

                          "operational", 0x400);

    memory_region_init_io(&xhci->mem_runtime, NULL, &xhci_runtime_ops, xhci,

    memory_region_init_io(&xhci->mem_runtime, OBJECT(xhci), &xhci_runtime_ops, xhci,

                          "runtime", LEN_RUNTIME);

    memory_region_init_io(&xhci->mem_doorbell, NULL, &xhci_doorbell_ops, xhci,

    memory_region_init_io(&xhci->mem_doorbell, OBJECT(xhci), &xhci_doorbell_ops, xhci,

                          "doorbell", LEN_DOORBELL);



    memory_region_add_subregion(&xhci->mem, 0,            &xhci->mem_cap);
@@ -3361,7 +3361,7 @@ static int usb_xhci_initfn(struct PCIDevice *dev) 
        XHCIPort *port = &xhci->ports[i];

        uint32_t offset = OFF_OPER + 0x400 + 0x10 * i;

        port->xhci = xhci;

        memory_region_init_io(&port->mem, NULL, &xhci_port_ops, port,

        memory_region_init_io(&port->mem, OBJECT(xhci), &xhci_port_ops, port,

                              port->name, 0x10);

        memory_region_add_subregion(&xhci->mem, offset, &port->mem);

    }