KVM: modify memslots layout in struct kvm

Have a pointer to an allocated region inside struct kvm.

[alex: fix ppc book 3s]

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c
index 15147583abd1..bc697a66a883 100644
--- a/virt/kvm/iommu.c
+++ b/virt/kvm/iommu.c
@@ -76,10 +76,13 @@ unmap_pages:
 static int kvm_iommu_map_memslots(struct kvm *kvm)
 {
         int i, r = 0;
+        struct kvm_memslots *slots;
 
-        for (i = 0; i < kvm->nmemslots; i++) {
-                r = kvm_iommu_map_pages(kvm, kvm->memslots[i].base_gfn,
-                                        kvm->memslots[i].npages);
+        slots = kvm->memslots;
+
+        for (i = 0; i < slots->nmemslots; i++) {
+                r = kvm_iommu_map_pages(kvm, slots->memslots[i].base_gfn,
+                                        slots->memslots[i].npages);
                 if (r)
                         break;
         }
@@ -210,10 +213,13 @@ static void kvm_iommu_put_pages(struct kvm *kvm,
 static int kvm_iommu_unmap_memslots(struct kvm *kvm)
 {
         int i;
+        struct kvm_memslots *slots;
+
+        slots = kvm->memslots;
 
-        for (i = 0; i < kvm->nmemslots; i++) {
-                kvm_iommu_put_pages(kvm, kvm->memslots[i].base_gfn,
-                                    kvm->memslots[i].npages);
+        for (i = 0; i < slots->nmemslots; i++) {
+                kvm_iommu_put_pages(kvm, slots->memslots[i].base_gfn,
+                                    slots->memslots[i].npages);
         }
 
         return 0;