iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: set_memory_region: Don't jump to out_free unnecessarily

Browse Source 
This makes the separation between the sanity checks and the rest of the
code a bit clearer.

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:10 +09:00 committed by Gleb Natapov
parent a046b816a4
commit 0ea75e1d26
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
virt/kvm/kvm_main.c
View File

@ -778,9 +778,9 @@ int __kvm_set_memory_region(struct kvm *kvm,
*/ */
r = -EINVAL; r = -EINVAL;
if (npages && old.npages && npages != old.npages) if (npages && old.npages && npages != old.npages)
goto out_free; goto out;
if (!npages && !old.npages) if (!npages && !old.npages)
goto out_free; goto out;
/* Check for overlaps */ /* Check for overlaps */
r = -EEXIST; r = -EEXIST;
@ -789,7 +789,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
continue; continue;
if (!((base_gfn + npages <= slot->base_gfn) || if (!((base_gfn + npages <= slot->base_gfn) ||
(base_gfn >= slot->base_gfn + slot->npages))) (base_gfn >= slot->base_gfn + slot->npages)))
goto out_free; goto out;
} }
/* Free page dirty bitmap if unneeded */ /* Free page dirty bitmap if unneeded */
@ -890,7 +890,6 @@ out_free:
kvm_free_physmem_slot(&new, &old); kvm_free_physmem_slot(&new, &old);
out: out:
return r; return r;
} }
EXPORT_SYMBOL_GPL(__kvm_set_memory_region); EXPORT_SYMBOL_GPL(__kvm_set_memory_region);