[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/7] vfio: Destroy memory regions
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PULL 1/7] vfio: Destroy memory regions |
Date: |
Fri, 17 Jan 2014 12:25:14 -0700 |
User-agent: |
StGit/0.17-dirty |
Somehow this has been lurking for a while; we remove our subregions
from the base BAR and VGA region mappings, but we don't destroy them,
creating a leak and more serious problems when we try to migrate after
removing these devices. Add the trivial bit of final cleanup to
remove these entirely.
Signed-off-by: Alex Williamson <address@hidden>
---
hw/misc/vfio.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
index 9aecaa8..ec9f41b 100644
--- a/hw/misc/vfio.c
+++ b/hw/misc/vfio.c
@@ -1968,6 +1968,7 @@ static void vfio_vga_quirk_teardown(VFIODevice *vdev)
while (!QLIST_EMPTY(&vdev->vga.region[i].quirks)) {
VFIOQuirk *quirk = QLIST_FIRST(&vdev->vga.region[i].quirks);
memory_region_del_subregion(&vdev->vga.region[i].mem, &quirk->mem);
+ memory_region_destroy(&quirk->mem);
QLIST_REMOVE(quirk, next);
g_free(quirk);
}
@@ -1990,6 +1991,7 @@ static void vfio_bar_quirk_teardown(VFIODevice *vdev, int
nr)
while (!QLIST_EMPTY(&bar->quirks)) {
VFIOQuirk *quirk = QLIST_FIRST(&bar->quirks);
memory_region_del_subregion(&bar->mem, &quirk->mem);
+ memory_region_destroy(&quirk->mem);
QLIST_REMOVE(quirk, next);
g_free(quirk);
}
@@ -2412,10 +2414,12 @@ static void vfio_unmap_bar(VFIODevice *vdev, int nr)
memory_region_del_subregion(&bar->mem, &bar->mmap_mem);
munmap(bar->mmap, memory_region_size(&bar->mmap_mem));
+ memory_region_destroy(&bar->mmap_mem);
if (vdev->msix && vdev->msix->table_bar == nr) {
memory_region_del_subregion(&bar->mem, &vdev->msix->mmap_mem);
munmap(vdev->msix->mmap, memory_region_size(&vdev->msix->mmap_mem));
+ memory_region_destroy(&vdev->msix->mmap_mem);
}
memory_region_destroy(&bar->mem);
- [Qemu-devel] [PULL 0/7] vfio pull request, Alex Williamson, 2014/01/17
- [Qemu-devel] [PULL 1/7] vfio: Destroy memory regions,
Alex Williamson <=
- [Qemu-devel] [PULL 2/7] vfio: warn if host device rom can't be read, Alex Williamson, 2014/01/17
- [Qemu-devel] [PULL 3/7] vfio: Do not reattempt a failed rom read, Alex Williamson, 2014/01/17
- [Qemu-devel] [PULL 4/7] vfio: Filter out bogus mappings, Alex Williamson, 2014/01/17
- [Qemu-devel] [PULL 5/7] vfio-pci: Fail initfn on DMA mapping errors, Alex Williamson, 2014/01/17
- [Qemu-devel] [PULL 6/7] kvm: initialize qemu_host_page_size, Alex Williamson, 2014/01/17
- [Qemu-devel] [PULL 7/7] vfio: fix mapping of MSIX bar, Alex Williamson, 2014/01/17