|
@@ -805,20 +805,25 @@ static int kvm_create_dirty_bitmap(struct kvm_memory_slot *memslot)
|
|
* sorted array and known changed memslot position.
|
|
* sorted array and known changed memslot position.
|
|
*/
|
|
*/
|
|
static void update_memslots(struct kvm_memslots *slots,
|
|
static void update_memslots(struct kvm_memslots *slots,
|
|
- struct kvm_memory_slot *new)
|
|
|
|
|
|
+ struct kvm_memory_slot *new,
|
|
|
|
+ enum kvm_mr_change change)
|
|
{
|
|
{
|
|
int id = new->id;
|
|
int id = new->id;
|
|
int i = slots->id_to_index[id];
|
|
int i = slots->id_to_index[id];
|
|
struct kvm_memory_slot *mslots = slots->memslots;
|
|
struct kvm_memory_slot *mslots = slots->memslots;
|
|
|
|
|
|
WARN_ON(mslots[i].id != id);
|
|
WARN_ON(mslots[i].id != id);
|
|
- if (!new->npages) {
|
|
|
|
- WARN_ON(!mslots[i].npages);
|
|
|
|
- if (mslots[i].npages)
|
|
|
|
- slots->used_slots--;
|
|
|
|
- } else {
|
|
|
|
- if (!mslots[i].npages)
|
|
|
|
- slots->used_slots++;
|
|
|
|
|
|
+ switch (change) {
|
|
|
|
+ case KVM_MR_CREATE:
|
|
|
|
+ slots->used_slots++;
|
|
|
|
+ WARN_ON(mslots[i].npages || !new->npages);
|
|
|
|
+ break;
|
|
|
|
+ case KVM_MR_DELETE:
|
|
|
|
+ slots->used_slots--;
|
|
|
|
+ WARN_ON(new->npages || !mslots[i].npages);
|
|
|
|
+ break;
|
|
|
|
+ default:
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
|
|
|
|
while (i < KVM_MEM_SLOTS_NUM - 1 &&
|
|
while (i < KVM_MEM_SLOTS_NUM - 1 &&
|
|
@@ -1054,7 +1059,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
|
|
memset(&new.arch, 0, sizeof(new.arch));
|
|
memset(&new.arch, 0, sizeof(new.arch));
|
|
}
|
|
}
|
|
|
|
|
|
- update_memslots(slots, &new);
|
|
|
|
|
|
+ update_memslots(slots, &new, change);
|
|
old_memslots = install_new_memslots(kvm, as_id, slots);
|
|
old_memslots = install_new_memslots(kvm, as_id, slots);
|
|
|
|
|
|
kvm_arch_commit_memory_region(kvm, mem, &old, &new, change);
|
|
kvm_arch_commit_memory_region(kvm, mem, &old, &new, change);
|