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, 8 insertions, 10 deletions

diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 43f4c92816e..42ad1f9c9f0 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -1366,14 +1366,12 @@ static void kvm_release_vm_pages(struct kvm *kvm)
 {
         struct kvm_memslots *slots;
         struct kvm_memory_slot *memslot;
-        int i, j;
+        int j;
         unsigned long base_gfn;
 
         slots = kvm_memslots(kvm);
-        for (i = 0; i < slots->nmemslots; i++) {
-                memslot = &slots->memslots[i];
+        kvm_for_each_memslot(memslot, slots) {
                 base_gfn = memslot->base_gfn;
-
                 for (j = 0; j < memslot->npages; j++) {
                         if (memslot->rmap[j])
                                 put_page((struct page *)memslot->rmap[j]);
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 715dcb4fb79..d737443cdfd 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1128,15 +1128,15 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,
                           int (*handler)(struct kvm *kvm, unsigned long *rmapp,
                                          unsigned long data))
 {
-        int i, j;
+        int j;
         int ret;
         int retval = 0;
         struct kvm_memslots *slots;
+        struct kvm_memory_slot *memslot;
 
         slots = kvm_memslots(kvm);
 
-        for (i = 0; i < slots->nmemslots; i++) {
-                struct kvm_memory_slot *memslot = &slots->memslots[i];
+        kvm_for_each_memslot(memslot, slots) {
                 unsigned long start = memslot->userspace_addr;
                 unsigned long end;
 
@@ -3985,15 +3985,15 @@ nomem:
  */
 unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm)
 {
-        int i;
         unsigned int nr_mmu_pages;
         unsigned int  nr_pages = 0;
         struct kvm_memslots *slots;
+        struct kvm_memory_slot *memslot;
 
         slots = kvm_memslots(kvm);
 
-        for (i = 0; i < slots->nmemslots; i++)
-                nr_pages += slots->memslots[i].npages;
+        kvm_for_each_memslot(memslot, slots)
+                nr_pages += memslot->npages;
 
         nr_mmu_pages = nr_pages * KVM_PERMILLE_MMU_PAGES / 1000;
         nr_mmu_pages = max(nr_mmu_pages,