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

piolist: add owner argument to initialization functions and pass devices 



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

hw/audio/adlib.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static void adlib_realizefn (DeviceState *dev, Error **errp) 


    adlib_portio_list[1].offset = s->port;

    adlib_portio_list[2].offset = s->port + 8;

    portio_list_init (port_list, adlib_portio_list, s, "adlib");

    portio_list_init (port_list, OBJECT(s), adlib_portio_list, s, "adlib");

    portio_list_add (port_list, isa_address_space_io(&s->parent_obj), 0);

}

hw/display/qxl.c

+2 −1
Original line number Diff line number Diff line
@@ -2070,7 +2070,8 @@ static int qxl_init_primary(PCIDevice *dev) 
    vga_common_init(vga, OBJECT(dev));

    vga_init(vga, OBJECT(dev),

             pci_address_space(dev), pci_address_space_io(dev), false);

    portio_list_init(qxl_vga_port_list, qxl_vga_portio_list, vga, "vga");

    portio_list_init(qxl_vga_port_list, OBJECT(dev), qxl_vga_portio_list,

                     vga, "vga");

    portio_list_add(qxl_vga_port_list, pci_address_space_io(dev), 0x3b0);



    vga->con = graphic_console_init(DEVICE(dev), &qxl_ops, qxl);

hw/display/vga.c

+2 −2
Original line number Diff line number Diff line
@@ -2372,11 +2372,11 @@ void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space, 
                                        1);

    memory_region_set_coalescing(vga_io_memory);

    if (init_vga_ports) {

        portio_list_init(vga_port_list, vga_ports, s, "vga");

        portio_list_init(vga_port_list, obj, vga_ports, s, "vga");

        portio_list_add(vga_port_list, address_space_io, 0x3b0);

    }

    if (vbe_ports) {

        portio_list_init(vbe_port_list, vbe_ports, s, "vbe");

        portio_list_init(vbe_port_list, obj, vbe_ports, s, "vbe");

        portio_list_add(vbe_port_list, address_space_io, 0x1ce);

    }

}

hw/dma/i82374.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void i82374_isa_realize(DeviceState *dev, Error **errp) 
    I82374State *s = &isa->state;

    PortioList *port_list = g_new(PortioList, 1);



    portio_list_init(port_list, i82374_portio_list, s, "i82374");

    portio_list_init(port_list, OBJECT(isa), i82374_portio_list, s, "i82374");

    portio_list_add(port_list, isa_address_space_io(&isa->parent_obj),

                    isa->iobase);

hw/isa/isa-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ void isa_register_portio_list(ISADevice *dev, uint16_t start, 
       actually handled e.g. the FDC device.  */

    isa_init_ioport(dev, start);



    portio_list_init(piolist, pio_start, opaque, name);

    portio_list_init(piolist, OBJECT(dev), pio_start, opaque, name);

    portio_list_add(piolist, isabus->address_space_io, start);

}