Commit 7c4228b4 authored by Alex Williamson's avatar Alex Williamson
Browse files

vfio: Destroy memory regions 



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: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 1cf892ca

hw/misc/vfio.c

+4 −0
Original line number Diff line number Diff line
@@ -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);