Commit 93abfc88 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

vga: set owner for mmio regions 



This makes sure the regions are properly cleaned when unplugging -device
seconday-vga.

Reported-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarThomas Huth <thuth@redhat.com>
Message-id: 20180626060941.8326-1-kraxel@redhat.com
parent e409d9a1

hw/display/vga-pci.c

+6 −5
Original line number Diff line number Diff line
@@ -192,22 +192,23 @@ static const MemoryRegionOps pci_vga_qext_ops = { 
};



void pci_std_vga_mmio_region_init(VGACommonState *s,

                                  Object *owner,

                                  MemoryRegion *parent,

                                  MemoryRegion *subs,

                                  bool qext)

{

    memory_region_init_io(&subs[0], NULL, &pci_vga_ioport_ops, s,

    memory_region_init_io(&subs[0], owner, &pci_vga_ioport_ops, s,

                          "vga ioports remapped", PCI_VGA_IOPORT_SIZE);

    memory_region_add_subregion(parent, PCI_VGA_IOPORT_OFFSET,

                                &subs[0]);



    memory_region_init_io(&subs[1], NULL, &pci_vga_bochs_ops, s,

    memory_region_init_io(&subs[1], owner, &pci_vga_bochs_ops, s,

                          "bochs dispi interface", PCI_VGA_BOCHS_SIZE);

    memory_region_add_subregion(parent, PCI_VGA_BOCHS_OFFSET,

                                &subs[1]);



    if (qext) {

        memory_region_init_io(&subs[2], NULL, &pci_vga_qext_ops, s,

        memory_region_init_io(&subs[2], owner, &pci_vga_qext_ops, s,

                              "qemu extended regs", PCI_VGA_QEXT_SIZE);

        memory_region_add_subregion(parent, PCI_VGA_QEXT_OFFSET,

                                    &subs[2]);
@@ -239,7 +240,7 @@ static void pci_std_vga_realize(PCIDevice *dev, Error **errp) 
            qext = true;

            pci_set_byte(&d->dev.config[PCI_REVISION_ID], 2);

        }

        pci_std_vga_mmio_region_init(s, &d->mmio, d->mrs, qext);

        pci_std_vga_mmio_region_init(s, OBJECT(dev), &d->mmio, d->mrs, qext);



        pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio);

    }
@@ -275,7 +276,7 @@ static void pci_secondary_vga_realize(PCIDevice *dev, Error **errp) 
        qext = true;

        pci_set_byte(&d->dev.config[PCI_REVISION_ID], 2);

    }

    pci_std_vga_mmio_region_init(s, &d->mmio, d->mrs, qext);

    pci_std_vga_mmio_region_init(s, OBJECT(dev), &d->mmio, d->mrs, qext);



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

    pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio);

hw/display/vga_int.h

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ extern const MemoryRegionOps vga_mem_ops; 


/* vga-pci.c */

void pci_std_vga_mmio_region_init(VGACommonState *s,

                                  Object *owner,

                                  MemoryRegion *parent,

                                  MemoryRegion *subs,

                                  bool qext);

hw/display/virtio-vga.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    }



    /* add stdvga mmio regions */

    pci_std_vga_mmio_region_init(vga, &vpci_dev->modern_bar,

    pci_std_vga_mmio_region_init(vga, OBJECT(vvga), &vpci_dev->modern_bar,

                                 vvga->vga_mrs, true);



    vga->con = g->scanout[0].con;