KVM: move the code that installs new slots array to a separate function.

Move repetitive code sequence to a separate function.

Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>

1 files changed, 13 insertions, 8 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 14cbae83be64..e45c20ca422a 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -702,6 +702,17 @@ static int check_memory_region_flags(struct kvm_userspace_memory_region *mem)
         return 0;
 }
 
+static struct kvm_memslots *install_new_memslots(struct kvm *kvm,
+                struct kvm_memslots *slots, struct kvm_memory_slot *new)
+{
+        struct kvm_memslots *old_memslots = kvm->memslots;
+
+        update_memslots(slots, new, kvm->memslots->generation);
+        rcu_assign_pointer(kvm->memslots, slots);
+        synchronize_srcu_expedited(&kvm->srcu);
+        return old_memslots; 
+}
+
 /*
  * Allocate some memory and give it an address in the guest physical address
  * space.
@@ -820,11 +831,8 @@ int __kvm_set_memory_region(struct kvm *kvm,
                 slot = id_to_memslot(slots, mem->slot);
                 slot->flags |= KVM_MEMSLOT_INVALID;
 
-                update_memslots(slots, NULL, kvm->memslots->generation);
+                old_memslots = install_new_memslots(kvm, slots, NULL);
 
-                old_memslots = kvm->memslots;
-                rcu_assign_pointer(kvm->memslots, slots);
-                synchronize_srcu_expedited(&kvm->srcu);
                 /* slot was deleted or moved, clear iommu mapping */
                 kvm_iommu_unmap_pages(kvm, &old);
                 /* From this point no new shadow pages pointing to a deleted,
@@ -868,10 +876,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
                 memset(&new.arch, 0, sizeof(new.arch));
         }
 
-        update_memslots(slots, &new, kvm->memslots->generation);
-        old_memslots = kvm->memslots;
-        rcu_assign_pointer(kvm->memslots, slots);
-        synchronize_srcu_expedited(&kvm->srcu);
+        old_memslots = install_new_memslots(kvm, slots, &new);
 
         kvm_arch_commit_memory_region(kvm, mem, old, user_alloc);