KVM: introduce kvm_for_each_memslot macro

Introduce kvm_for_each_memslot to walk all valid memslot

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

2 files changed, 15 insertions, 16 deletions

diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c
index a195c07fa829..4e5f7b7f1d2b 100644
--- a/virt/kvm/iommu.c
+++ b/virt/kvm/iommu.c
@@ -134,14 +134,15 @@ unmap_pages:
 
 static int kvm_iommu_map_memslots(struct kvm *kvm)
 {
-        int i, idx, r = 0;
+        int idx, r = 0;
         struct kvm_memslots *slots;
+        struct kvm_memory_slot *memslot;
 
         idx = srcu_read_lock(&kvm->srcu);
         slots = kvm_memslots(kvm);
 
-        for (i = 0; i < slots->nmemslots; i++) {
-                r = kvm_iommu_map_pages(kvm, &slots->memslots[i]);
+        kvm_for_each_memslot(memslot, slots) {
+                r = kvm_iommu_map_pages(kvm, memslot);
                 if (r)
                         break;
         }
@@ -311,16 +312,16 @@ static void kvm_iommu_put_pages(struct kvm *kvm,
 
 static int kvm_iommu_unmap_memslots(struct kvm *kvm)
 {
-        int i, idx;
+        int idx;
         struct kvm_memslots *slots;
+        struct kvm_memory_slot *memslot;
 
         idx = srcu_read_lock(&kvm->srcu);
         slots = kvm_memslots(kvm);
 
-        for (i = 0; i < slots->nmemslots; i++) {
-                kvm_iommu_put_pages(kvm, slots->memslots[i].base_gfn,
-                                    slots->memslots[i].npages);
-        }
+        kvm_for_each_memslot(memslot, slots)
+                kvm_iommu_put_pages(kvm, memslot->base_gfn, memslot->npages);
+
         srcu_read_unlock(&kvm->srcu, idx);
 
         return 0;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index b5ed7770ced3..4c2900c5d81d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -547,11 +547,11 @@ static void kvm_free_physmem_slot(struct kvm_memory_slot *free,
 
 void kvm_free_physmem(struct kvm *kvm)
 {
-        int i;
         struct kvm_memslots *slots = kvm->memslots;
+        struct kvm_memory_slot *memslot;
 
-        for (i = 0; i < slots->nmemslots; ++i)
-                kvm_free_physmem_slot(&slots->memslots[i], NULL);
+        kvm_for_each_memslot(memslot, slots)
+                kvm_free_physmem_slot(memslot, NULL);
 
         kfree(kvm->memslots);
 }
@@ -975,15 +975,13 @@ EXPORT_SYMBOL_GPL(kvm_is_error_hva);
 static struct kvm_memory_slot *__gfn_to_memslot(struct kvm_memslots *slots,
                                                 gfn_t gfn)
 {
-        int i;
-
-        for (i = 0; i < slots->nmemslots; ++i) {
-                struct kvm_memory_slot *memslot = &slots->memslots[i];
+        struct kvm_memory_slot *memslot;
 
+        kvm_for_each_memslot(memslot, slots)
                 if (gfn >= memslot->base_gfn
                     && gfn < memslot->base_gfn + memslot->npages)
                         return memslot;
-        }
+
         return NULL;
 }