OSDN Git Service

kvm: update_memslots: drop not needed check for the same number of pages
authorIgor Mammedov <imammedo@redhat.com>
Mon, 1 Dec 2014 17:29:23 +0000 (17:29 +0000)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 4 Dec 2014 14:29:09 +0000 (15:29 +0100)
if number of pages haven't changed sorting algorithm
will do nothing, so there is no need to do extra check
to avoid entering sorting logic.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
virt/kvm/kvm_main.c

index 5b45330..407277b 100644 (file)
@@ -679,21 +679,19 @@ static void update_memslots(struct kvm_memslots *slots,
        struct kvm_memory_slot *mslots = slots->memslots;
 
        WARN_ON(mslots[i].id != id);
-       if (new->npages != mslots[i].npages) {
-               if (new->npages < mslots[i].npages) {
-                       while (i < KVM_MEM_SLOTS_NUM - 1 &&
-                              new->npages < mslots[i + 1].npages) {
-                               mslots[i] = mslots[i + 1];
-                               slots->id_to_index[mslots[i].id] = i;
-                               i++;
-                       }
-               } else {
-                       while (i > 0 &&
-                              new->npages > mslots[i - 1].npages) {
-                               mslots[i] = mslots[i - 1];
-                               slots->id_to_index[mslots[i].id] = i;
-                               i--;
-                       }
+       if (new->npages < mslots[i].npages) {
+               while (i < KVM_MEM_SLOTS_NUM - 1 &&
+                      new->npages < mslots[i + 1].npages) {
+                       mslots[i] = mslots[i + 1];
+                       slots->id_to_index[mslots[i].id] = i;
+                       i++;
+               }
+       } else {
+               while (i > 0 &&
+                      new->npages > mslots[i - 1].npages) {
+                       mslots[i] = mslots[i - 1];
+                       slots->id_to_index[mslots[i].id] = i;
+                       i--;
                }
        }