summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-09-13 15:01:29 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-09-13 15:20:55 +0200
commitad53e35ae529e65cbd8e75a1e66fdcd10275c8d9 (patch)
tree89638c031980400e2a7927e4b77afd9b3d6b6a7a /virt
parent6f90f1d1d2d853b2745afdd83800b170996fab50 (diff)
parentaad9e5ba243336d2b133e7fa9aace1a51d6fdae6 (diff)
downloadop-kernel-dev-ad53e35ae529e65cbd8e75a1e66fdcd10275c8d9.zip
op-kernel-dev-ad53e35ae529e65cbd8e75a1e66fdcd10275c8d9.tar.gz
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD
Paul Mackerras writes: The highlights are: * Reduced latency for interrupts from PCI pass-through devices, from Suresh Warrier and me. * Halt-polling implementation from Suraj Jitindar Singh. * 64-bit VCPU statistics, also from Suraj. * Various other minor fixes and improvements.
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index b3fa12c..a00f8e4 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3619,7 +3619,7 @@ static int vm_stat_get_per_vm(void *data, u64 *val)
{
struct kvm_stat_data *stat_data = (struct kvm_stat_data *)data;
- *val = *(u32 *)((void *)stat_data->kvm + stat_data->offset);
+ *val = *(ulong *)((void *)stat_data->kvm + stat_data->offset);
return 0;
}
@@ -3649,7 +3649,7 @@ static int vcpu_stat_get_per_vm(void *data, u64 *val)
*val = 0;
kvm_for_each_vcpu(i, vcpu, stat_data->kvm)
- *val += *(u32 *)((void *)vcpu + stat_data->offset);
+ *val += *(u64 *)((void *)vcpu + stat_data->offset);
return 0;
}
OpenPOWER on IntegriCloud