david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

secondary-vga: delete mmio subregions upon exit

Browse Source 
93abfc88bd649de1933588bfc7175605331b3ea9 introduced a reference cycle in
the vga-pci devices, preventing cleanup of the object upon hotblug.

This patch allows to break the cycle.

Signed-off-by: remy.noel <remy.noel@blade-group.com>
Message-id: 20181002121935.23706-1-remy.noel@blade-group.com

[ kraxel: delete the recently added edid region too ]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
remy.noel 2018-10-02 14:19:35 +02:00 committed by Gerd Hoffmann
parent 5a358b39f5
commit 0ab90e6170
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/display/vga-pci.c
View File

@ -309,6 +309,14 @@ static void pci_secondary_vga_exit(PCIDevice *dev)
VGACommonState *s = &d->vga;
graphic_console_close(s->con);
memory_region_del_subregion(&d->mmio, &d->mrs[0]);
memory_region_del_subregion(&d->mmio, &d->mrs[1]);
if (d->flags & (1 << PCI_VGA_FLAG_ENABLE_QEXT)) {
memory_region_del_subregion(&d->mmio, &d->mrs[2]);
}
if (d->flags & (1 << PCI_VGA_FLAG_ENABLE_EDID)) {
memory_region_del_subregion(&d->mmio, &d->mrs[3]);
}
}
static void pci_secondary_vga_init(Object *obj)