evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KVM: set_memory_region: Don't check for overlaps unless we create or move a slot

Browse source 
Don't need the check for deleting an existing slot or just modifiying
the flags.

Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
This commit is contained in:
Takuya Yoshikawa 2013-01-11 18:26:55 +09:00 • committed by Gleb Natapov
parent 0ea75e1d26
commit 0a706beefb
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
virt/kvm/kvm_main.c
View file

@ -782,14 +782,16 @@ int __kvm_set_memory_region(struct kvm *kvm,
if (!npages && !old.npages) if (!npages && !old.npages)
goto out; goto out;
/* Check for overlaps */ if ((npages && !old.npages) || (base_gfn != old.base_gfn)) {
r = -EEXIST; /* Check for overlaps */
kvm_for_each_memslot(slot, kvm->memslots) { r = -EEXIST;
if (slot->id >= KVM_USER_MEM_SLOTS || slot == memslot) kvm_for_each_memslot(slot, kvm->memslots) {
continue; if (slot->id >= KVM_USER_MEM_SLOTS || slot == memslot)
if (!((base_gfn + npages <= slot->base_gfn) || continue;
(base_gfn >= slot->base_gfn + slot->npages))) if (!((base_gfn + npages <= slot->base_gfn) ||
goto out; (base_gfn >= slot->base_gfn + slot->npages)))
goto out;
}
} }
/* Free page dirty bitmap if unneeded */ /* Free page dirty bitmap if unneeded */