KVM: Introduce gfn_to_index() which returns the index for a given level

[linux-flexiantxendom0-3.2.10.git] / virt / kvm / kvm_main.c

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 470e305..415fe81 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -784,15 +784,10 @@ int __kvm_set_memory_region(struct kvm *kvm,
                int lpages;
                int level = i + 2;
 
-               /* Avoid unused variable warning if no large pages */
-               (void)level;
-
                if (new.lpage_info[i])
                        continue;
 
-               lpages = 1 + ((base_gfn + npages - 1)
-                            >> KVM_HPAGE_GFN_SHIFT(level));
-               lpages -= base_gfn >> KVM_HPAGE_GFN_SHIFT(level);
+               lpages = gfn_to_index(base_gfn + npages - 1, base_gfn, level) + 1;
 
                new.lpage_info[i] = vzalloc(lpages * sizeof(*new.lpage_info[i]));