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

Commit 5cc15027 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

kvm: simplify update_memslots invocation 



The update_memslots invocation is only needed in one case.  Make
the code clearer by moving it to __kvm_set_memory_region, and
removing the wrapper around insert_memslot.

Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarTakuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f2a81036

virt/kvm/kvm_main.c

+6 −14
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ static int kvm_create_dirty_bitmap(struct kvm_memory_slot *memslot) 
 * takes advantage of having initially sorted array and

 * known changed memslot position.

 */

static void insert_memslot(struct kvm_memslots *slots,

static void update_memslots(struct kvm_memslots *slots,

			    struct kvm_memory_slot *new)

{

	int id = new->id;
@@ -704,14 +704,6 @@ static void insert_memslot(struct kvm_memslots *slots, 
	slots->id_to_index[mslots[i].id] = i;

}



static void update_memslots(struct kvm_memslots *slots,

			    struct kvm_memory_slot *new)

{

	if (new) {

		insert_memslot(slots, new);

	}

}



static int check_memory_region_flags(struct kvm_userspace_memory_region *mem)

{

	u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES;
@@ -727,7 +719,7 @@ static int check_memory_region_flags(struct kvm_userspace_memory_region *mem) 
}



static struct kvm_memslots *install_new_memslots(struct kvm *kvm,

		struct kvm_memslots *slots, struct kvm_memory_slot *new)

		struct kvm_memslots *slots)

{

	struct kvm_memslots *old_memslots = kvm->memslots;
@@ -738,7 +730,6 @@ static struct kvm_memslots *install_new_memslots(struct kvm *kvm, 
	WARN_ON(old_memslots->generation & 1);

	slots->generation = old_memslots->generation + 1;



	update_memslots(slots, new);

	rcu_assign_pointer(kvm->memslots, slots);

	synchronize_srcu_expedited(&kvm->srcu);
@@ -875,7 +866,7 @@ int __kvm_set_memory_region(struct kvm *kvm, 
		slot = id_to_memslot(slots, mem->slot);

		slot->flags |= KVM_MEMSLOT_INVALID;



		old_memslots = install_new_memslots(kvm, slots, NULL);

		old_memslots = install_new_memslots(kvm, slots);



		/* slot was deleted or moved, clear iommu mapping */

		kvm_iommu_unmap_pages(kvm, &old);
@@ -906,7 +897,8 @@ int __kvm_set_memory_region(struct kvm *kvm, 
		memset(&new.arch, 0, sizeof(new.arch));

	}



	old_memslots = install_new_memslots(kvm, slots, &new);

	update_memslots(slots, &new);

	old_memslots = install_new_memslots(kvm, slots);



	kvm_arch_commit_memory_region(kvm, mem, &old, change);