cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
0a122b
From 6ca164c42aa26e2273871061aa509cc50bd0dc4c Mon Sep 17 00:00:00 2001
0a122b
From: Alex Williamson <alex.williamson@redhat.com>
0a122b
Date: Wed, 22 Jan 2014 21:33:06 -0500
0a122b
Subject: [PATCH 2/6] vfio: Destroy memory regions
0a122b
0a122b
Message-id: <20140122213238.6166.63139.stgit@bling.home>
0a122b
Patchwork-id: 56902
0a122b
O-Subject: [RHEL-7 qemu-kvm PATCH 1/1] vfio: Destroy memory regions
0a122b
Bugzilla: 1052030
0a122b
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
0a122b
RH-Acked-by: Bandan Das <bsd@redhat.com>
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
0a122b
Bugzilla: 1052030
0a122b
Upstream: 7c4228b4771acddcb8815079bc116007cec8a1ff (tag from pull request)
0a122b
0a122b
Somehow this has been lurking for a while; we remove our subregions
0a122b
from the base BAR and VGA region mappings, but we don't destroy them,
0a122b
creating a leak and more serious problems when we try to migrate after
0a122b
removing these devices.  Add the trivial bit of final cleanup to
0a122b
remove these entirely.
0a122b
0a122b
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
0a122b
---
0a122b
 hw/misc/vfio.c |    4 ++++
0a122b
 1 file changed, 4 insertions(+)
0a122b
0a122b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
0a122b
---
0a122b
 hw/misc/vfio.c | 4 ++++
0a122b
 1 file changed, 4 insertions(+)
0a122b
0a122b
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
0a122b
index 83f2b6a..e1f30a2 100644
0a122b
--- a/hw/misc/vfio.c
0a122b
+++ b/hw/misc/vfio.c
0a122b
@@ -1928,6 +1928,7 @@ static void vfio_vga_quirk_teardown(VFIODevice *vdev)
0a122b
         while (!QLIST_EMPTY(&vdev->vga.region[i].quirks)) {
0a122b
             VFIOQuirk *quirk = QLIST_FIRST(&vdev->vga.region[i].quirks);
0a122b
             memory_region_del_subregion(&vdev->vga.region[i].mem, &quirk->mem);
0a122b
+            memory_region_destroy(&quirk->mem);
0a122b
             QLIST_REMOVE(quirk, next);
0a122b
             g_free(quirk);
0a122b
         }
0a122b
@@ -1950,6 +1951,7 @@ static void vfio_bar_quirk_teardown(VFIODevice *vdev, int nr)
0a122b
     while (!QLIST_EMPTY(&bar->quirks)) {
0a122b
         VFIOQuirk *quirk = QLIST_FIRST(&bar->quirks);
0a122b
         memory_region_del_subregion(&bar->mem, &quirk->mem);
0a122b
+        memory_region_destroy(&quirk->mem);
0a122b
         QLIST_REMOVE(quirk, next);
0a122b
         g_free(quirk);
0a122b
     }
0a122b
@@ -2379,10 +2381,12 @@ static void vfio_unmap_bar(VFIODevice *vdev, int nr)
0a122b
 
0a122b
     memory_region_del_subregion(&bar->mem, &bar->mmap_mem);
0a122b
     munmap(bar->mmap, memory_region_size(&bar->mmap_mem));
0a122b
+    memory_region_destroy(&bar->mmap_mem);
0a122b
 
0a122b
     if (vdev->msix && vdev->msix->table_bar == nr) {
0a122b
         memory_region_del_subregion(&bar->mem, &vdev->msix->mmap_mem);
0a122b
         munmap(vdev->msix->mmap, memory_region_size(&vdev->msix->mmap_mem));
0a122b
+        memory_region_destroy(&vdev->msix->mmap_mem);
0a122b
     }
0a122b
 
0a122b
     memory_region_destroy(&bar->mem);
0a122b
-- 
0a122b
1.8.3.1
0a122b