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

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

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



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

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 0ea75e1d

virt/kvm/kvm_main.c

+10 −8
Original line number Diff line number Diff line
@@ -782,6 +782,7 @@ int __kvm_set_memory_region(struct kvm *kvm, 
	if (!npages && !old.npages)

		goto out;



	if ((npages && !old.npages) || (base_gfn != old.base_gfn)) {

		/* Check for overlaps */

		r = -EEXIST;

		kvm_for_each_memslot(slot, kvm->memslots) {
@@ -791,6 +792,7 @@ int __kvm_set_memory_region(struct kvm *kvm, 
			      (base_gfn >= slot->base_gfn + slot->npages)))

				goto out;

		}

	}



	/* Free page dirty bitmap if unneeded */

	if (!(new.flags & KVM_MEM_LOG_DIRTY_PAGES))