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

This patch cleans up the code and removes the "(void)level;" warning
suppressor.

Note that we can also use this for PT_PAGE_TABLE_LEVEL to treat every
level uniformly later.

Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 6 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 470e30520fe8..415fe816fc15 100644
--- 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]));