1 files changed, 5 insertions, 8 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index e6cfd4344d28..1cd693a76a51 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -714,8 +714,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
         int r;
         gfn_t base_gfn;
         unsigned long npages;
-        unsigned long i;
-        struct kvm_memory_slot *memslot;
+        struct kvm_memory_slot *memslot, *slot;
         struct kvm_memory_slot old, new;
         struct kvm_memslots *slots, *old_memslots;
 
@@ -766,13 +765,11 @@ int __kvm_set_memory_region(struct kvm *kvm,
 
         /* Check for overlaps */
         r = -EEXIST;
-        for (i = 0; i < KVM_MEMORY_SLOTS; ++i) {
-                struct kvm_memory_slot *s = &kvm->memslots->memslots[i];
-
-                if (s == memslot || !s->npages)
+        kvm_for_each_memslot(slot, kvm->memslots) {
+                if (slot->id >= KVM_MEMORY_SLOTS || slot == memslot)
                         continue;
-                if (!((base_gfn + npages <= s->base_gfn) ||
-                      (base_gfn >= s->base_gfn + s->npages)))
+                if (!((base_gfn + npages <= slot->base_gfn) ||
+                      (base_gfn >= slot->base_gfn + slot->npages)))
                         goto out_free;
         }