Commit 848696bf authored by Kirill Batuzov's avatar Kirill Batuzov Committed by Andreas Färber
Browse files

PortioList: Store PortioList in device state 



PortioList is an abstraction used for construction of MemoryRegionPortioList
from MemoryRegionPortio. It can be used later to unmap created memory regions.
It also requires proper cleanup because some of the memory inside is allocated
dynamically.

By moving PortioList ot device state we make it possible to cleanup later and
avoid leaking memory.

This change spans several target platforms.  The following testcases cover all
changed lines:
  qemu-system-ppc -M prep
  qemu-system-i386 -vga qxl
  qemu-system-i386 -M isapc -soundhw adlib -device ib700,id=watchdog0,bus=isa.0

Signed-off-by: default avatarKirill Batuzov <batuzovk@ispras.ru>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent cc900d34

hw/audio/adlib.c

+3 −3
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ typedef struct { 
#ifndef HAS_YMF262

    FM_OPL *opl;

#endif

    PortioList port_list;

} AdlibState;



static AdlibState *glob_adlib;
@@ -293,7 +294,6 @@ static MemoryRegionPortio adlib_portio_list[] = { 
static void adlib_realizefn (DeviceState *dev, Error **errp)

{

    AdlibState *s = ADLIB(dev);

    PortioList *port_list = g_new(PortioList, 1);

    struct audsettings as;



    if (glob_adlib) {
@@ -349,8 +349,8 @@ static void adlib_realizefn (DeviceState *dev, Error **errp) 


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

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

    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);

    portio_list_init (&s->port_list, OBJECT(s), adlib_portio_list, s, "adlib");

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

}



static Property adlib_properties[] = {

hw/display/qxl.c

+3 −4
Original line number Diff line number Diff line
@@ -2055,7 +2055,6 @@ static int qxl_init_primary(PCIDevice *dev) 
{

    PCIQXLDevice *qxl = DO_UPCAST(PCIQXLDevice, pci, dev);

    VGACommonState *vga = &qxl->vga;

    PortioList *qxl_vga_port_list = g_new(PortioList, 1);

    int rc;



    qxl->id = 0;
@@ -2064,10 +2063,10 @@ static int qxl_init_primary(PCIDevice *dev) 
    vga_common_init(vga, OBJECT(dev), true);

    vga_init(vga, OBJECT(dev),

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

    portio_list_init(qxl_vga_port_list, OBJECT(dev), qxl_vga_portio_list,

    portio_list_init(&qxl->vga_port_list, OBJECT(dev), qxl_vga_portio_list,

                     vga, "vga");

    portio_list_set_flush_coalesced(qxl_vga_port_list);

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

    portio_list_set_flush_coalesced(&qxl->vga_port_list);

    portio_list_add(&qxl->vga_port_list, pci_address_space_io(dev), 0x3b0);



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

    qemu_spice_display_init_common(&qxl->ssd);

hw/display/qxl.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ enum qxl_mode { 


typedef struct PCIQXLDevice {

    PCIDevice          pci;

    PortioList         vga_port_list;

    SimpleSpiceDisplay ssd;

    int                id;

    uint32_t           debug;

hw/display/vga.c

+5 −7
Original line number Diff line number Diff line
@@ -2355,8 +2355,6 @@ void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space, 
{

    MemoryRegion *vga_io_memory;

    const MemoryRegionPortio *vga_ports, *vbe_ports;

    PortioList *vga_port_list = g_new(PortioList, 1);

    PortioList *vbe_port_list = g_new(PortioList, 1);



    qemu_register_reset(vga_reset, s);
@@ -2371,13 +2369,13 @@ 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, obj, vga_ports, s, "vga");

        portio_list_set_flush_coalesced(vga_port_list);

        portio_list_add(vga_port_list, address_space_io, 0x3b0);

        portio_list_init(&s->vga_port_list, obj, vga_ports, s, "vga");

        portio_list_set_flush_coalesced(&s->vga_port_list);

        portio_list_add(&s->vga_port_list, address_space_io, 0x3b0);

    }

    if (vbe_ports) {

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

        portio_list_add(vbe_port_list, address_space_io, 0x1ce);

        portio_list_init(&s->vbe_port_list, obj, vbe_ports, s, "vbe");

        portio_list_add(&s->vbe_port_list, address_space_io, 0x1ce);

    }

}

hw/display/vga_int.h

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ typedef struct VGACommonState { 
    void (*get_resolution)(struct VGACommonState *s,

                        int *pwidth,

                        int *pheight);

    PortioList vga_port_list;

    PortioList vbe_port_list;

    /* bochs vbe state */

    uint16_t vbe_index;

    uint16_t vbe_regs[VBE_DISPI_INDEX_NB];