KVM: introduce update_memslots function

Introduce update_memslots to update slot which will be update to
kvm->memslots

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 15 insertions, 7 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 9ad94c9996e7..b5ed7770ced3 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -630,6 +630,19 @@ static int kvm_create_dirty_bitmap(struct kvm_memory_slot *memslot)
 }
 #endif /* !CONFIG_S390 */
 
+void update_memslots(struct kvm_memslots *slots, struct kvm_memory_slot *new)
+{
+        if (new) {
+                int id = new->id;
+
+                slots->memslots[id] = *new;
+                if (id >= slots->nmemslots)
+                        slots->nmemslots = id + 1;
+        }
+
+        slots->generation++;
+}
+
 /*
  * Allocate some memory and give it an address in the guest physical address
  * space.
@@ -780,10 +793,8 @@ skip_lpage:
                                 GFP_KERNEL);
                 if (!slots)
                         goto out_free;
-                if (mem->slot >= slots->nmemslots)
-                        slots->nmemslots = mem->slot + 1;
-                slots->generation++;
                 slots->memslots[mem->slot].flags |= KVM_MEMSLOT_INVALID;
+                update_memslots(slots, NULL);
 
                 old_memslots = kvm->memslots;
                 rcu_assign_pointer(kvm->memslots, slots);
@@ -815,9 +826,6 @@ skip_lpage:
                         GFP_KERNEL);
         if (!slots)
                 goto out_free;
-        if (mem->slot >= slots->nmemslots)
-                slots->nmemslots = mem->slot + 1;
-        slots->generation++;
 
         /* actual memory is freed via old in kvm_free_physmem_slot below */
         if (!npages) {
@@ -827,7 +835,7 @@ skip_lpage:
                         new.lpage_info[i] = NULL;
         }
 
-        slots->memslots[mem->slot] = new;
+        update_memslots(slots, &new);
         old_memslots = kvm->memslots;
         rcu_assign_pointer(kvm->memslots, slots);
         synchronize_srcu_expedited(&kvm->srcu);