aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm/kvm_main.c
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2008-12-03 10:40:51 -0500
committerAvi Kivity <avi@redhat.com>2008-12-31 09:55:41 -0500
commit6f89724829cfd4ad6771a92fd4b8d59c90c7220c (patch)
tree8387a9838e786b687739be61eda01eb65253f844 /virt/kvm/kvm_main.c
parent7b7015914b30ad8d9136d41412c5129b9bc9af70 (diff)
KVM: Really remove a slot when a user ask us so
Right now, KVM does not remove a slot when we do a register ioctl for size 0 (would be the expected behaviour). Instead, we only mark it as empty, but keep all bitmaps and allocated data structures present. It completely nullifies our chances of reusing that same slot again for mapping a different piece of memory. In this patch, we destroy rmaps, and vfree() the pointers that used to hold the dirty bitmap, rmap and lpage_info structures. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt/kvm/kvm_main.c')
-rw-r--r--virt/kvm/kvm_main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index e41d39d6b0ef..fd9cc79092cb 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1020,7 +1020,10 @@ int __kvm_set_memory_region(struct kvm *kvm,
1020 goto out_free; 1020 goto out_free;
1021 } 1021 }
1022 1022
1023 kvm_free_physmem_slot(&old, &new); 1023 kvm_free_physmem_slot(&old, npages ? &new : NULL);
1024 /* Slot deletion case: we have to update the current slot */
1025 if (!npages)
1026 *memslot = old;
1024#ifdef CONFIG_DMAR 1027#ifdef CONFIG_DMAR
1025 /* map the pages in iommu page table */ 1028 /* map the pages in iommu page table */
1026 r = kvm_iommu_map_pages(kvm, base_gfn, npages); 1029 r = kvm_iommu_map_pages(kvm, base_gfn, npages);