path: root/virt
diff options
authorGlauber Costa <glommer@redhat.com>2008-12-03 13:40:51 -0200
committerAvi Kivity <avi@redhat.com>2008-12-31 16:55:41 +0200
commit6f89724829cfd4ad6771a92fd4b8d59c90c7220c (patch)
tree8387a9838e786b687739be61eda01eb65253f844 /virt
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')
1 files changed, 4 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index e41d39d6b0e..fd9cc79092c 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,
goto out_free;
- kvm_free_physmem_slot(&old, &new);
+ kvm_free_physmem_slot(&old, npages ? &new : NULL);
+ /* Slot deletion case: we have to update the current slot */
+ if (!npages)
+ *memslot = old;
/* map the pages in iommu page table */
r = kvm_iommu_map_pages(kvm, base_gfn, npages);