KVM: switch per-VM stats to u64

Make them the same type as vCPU stats.  There is no reason
to limit the counters to unsigned long.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 7cd7d5c8c4bc229d6db09d21716cd94908938073..d56f365b38a83fa0ff521ef0a0a2473b5954846a 100644 (file)
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -556,7 +556,7 @@ static inline bool __vcpu_write_sys_reg_to_cpu(u64 val, int reg)
 }
 
 struct kvm_vm_stat {
-       ulong remote_tlb_flush;
+       u64 remote_tlb_flush;
 };
 
 struct kvm_vcpu_stat {

diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index fca4547d580f098aa1aa2d6f8d44fbc8e5d46146..4245c082095f651c619d818c01af608b1fc59dac 100644 (file)
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -109,7 +109,7 @@ static inline bool kvm_is_error_hva(unsigned long addr)
 }
 
 struct kvm_vm_stat {
-       ulong remote_tlb_flush;
+       u64 remote_tlb_flush;
 };
 
 struct kvm_vcpu_stat {

diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index 7f2e90db2050b0a7ecab7615c9a4fd0b910ca548..ae3d4af61b66f16c75d49e0cda1bae698d801e99 100644 (file)
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -81,9 +81,9 @@ struct kvmppc_book3s_shadow_vcpu;
 struct kvm_nested_guest;
 
 struct kvm_vm_stat {
-       ulong remote_tlb_flush;
-       ulong num_2M_pages;
-       ulong num_1G_pages;
+       u64 remote_tlb_flush;
+       u64 num_2M_pages;
+       u64 num_1G_pages;
 };
 
 struct kvm_vcpu_stat {

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index a92d56590613559768e74256d4bcb88af0f4a75f..a0c29e29dd482ccc32548f1012e39961da1d6d2f 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1158,17 +1158,17 @@ struct kvm_arch {
 };
 
 struct kvm_vm_stat {
-       ulong mmu_shadow_zapped;
-       ulong mmu_pte_write;
-       ulong mmu_pde_zapped;
-       ulong mmu_flooded;
-       ulong mmu_recycled;
-       ulong mmu_cache_miss;
-       ulong mmu_unsync;
-       ulong remote_tlb_flush;
-       ulong lpages;
-       ulong nx_lpage_splits;
-       ulong max_mmu_page_hash_collisions;
+       u64 mmu_shadow_zapped;
+       u64 mmu_pte_write;
+       u64 mmu_pde_zapped;
+       u64 mmu_flooded;
+       u64 mmu_recycled;
+       u64 mmu_cache_miss;
+       u64 mmu_unsync;
+       u64 remote_tlb_flush;
+       u64 lpages;
+       u64 nx_lpage_splits;
+       u64 max_mmu_page_hash_collisions;
 };
 
 struct kvm_vcpu_stat {

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index fc35ba0ea5d3b0a245e81849c278b6913ae5e8d7..ed4d1581d5029dcbc48268f09d332ad5014fcfd1 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -4833,14 +4833,14 @@ static int kvm_debugfs_release(struct inode *inode, struct file *file)
 
 static int kvm_get_stat_per_vm(struct kvm *kvm, size_t offset, u64 *val)
 {
-       *val = *(ulong *)((void *)kvm + offset);
+       *val = *(u64 *)((void *)kvm + offset);
 
        return 0;
 }
 
 static int kvm_clear_stat_per_vm(struct kvm *kvm, size_t offset)
 {
-       *(ulong *)((void *)kvm + offset) = 0;
+       *(u64 *)((void *)kvm + offset) = 0;
 
        return 0;
 }