From 0ab90e617040e5590f7fc403b5d34f76f53f6bdc Mon Sep 17 00:00:00 2001 From: "remy.noel" Date: Tue, 2 Oct 2018 14:19:35 +0200 Subject: secondary-vga: delete mmio subregions upon exit 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 Message-id: 20181002121935.23706-1-remy.noel@blade-group.com [ kraxel: delete the recently added edid region too ] Signed-off-by: Gerd Hoffmann --- hw/display/vga-pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'hw/display') diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index 24ca1b3..a17c96e 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -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) -- cgit v1.1