KVM: set_memory_region: Don't jump to out_free unnecessarily

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

Reviewed-by: Marcelo Tosatti <[email protected]>
Signed-off-by: Takuya Yoshikawa <[email protected]>
Signed-off-by: Gleb Natapov <[email protected]>

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