Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ea75e1d authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Gleb Natapov
Browse files

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: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent a046b816

virt/kvm/kvm_main.c

+3 −4
Original line number Diff line number Diff line
@@ -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 @@ int __kvm_set_memory_region(struct kvm *kvm, 
	kvm_free_physmem_slot(&new, &old);

out:

	return r;



}

EXPORT_SYMBOL_GPL(__kvm_set_memory_region);