korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-19 20:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

kvm: simplify update_memslots invocation

Browse Source 
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: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-11-14 10:55:31 +01:00
parent f2a8103651
commit 5cc1502799
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
virt/kvm/kvm_main.c
View File

@ -674,8 +674,8 @@ static int kvm_create_dirty_bitmap(struct kvm_memory_slot *memslot)
* takes advantage of having initially sorted array and * takes advantage of having initially sorted array and
* known changed memslot position. * 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) struct kvm_memory_slot *new)
{ {
int id = new->id; int id = new->id;
int i = slots->id_to_index[id]; int i = slots->id_to_index[id];
@ -704,14 +704,6 @@ static void insert_memslot(struct kvm_memslots *slots,
slots->id_to_index[mslots[i].id] = i; 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) static int check_memory_region_flags(struct kvm_userspace_memory_region *mem)
{ {
u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES; 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, 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; 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); WARN_ON(old_memslots->generation & 1);
slots->generation = old_memslots->generation + 1; slots->generation = old_memslots->generation + 1;
update_memslots(slots, new);
rcu_assign_pointer(kvm->memslots, slots); rcu_assign_pointer(kvm->memslots, slots);
synchronize_srcu_expedited(&kvm->srcu); 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 = id_to_memslot(slots, mem->slot);
slot->flags |= KVM_MEMSLOT_INVALID; 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 */ /* slot was deleted or moved, clear iommu mapping */
kvm_iommu_unmap_pages(kvm, &old); 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)); 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); kvm_arch_commit_memory_region(kvm, mem, &old, change);