diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-08-15 07:41:16 +1000 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-08-15 07:41:16 +1000 |
| commit | c4d062885529a84928ddd260dab419b7d8dd4f90 (patch) | |
| tree | 8913d8b45e6050a90ccd57be6b8692af5302fdf9 | |
| parent | a733f37aef3b7d1d33bfe2716af88cdfd67ba64e (diff) | |
| parent | a6e65975c3fac1b2f067fef8eeed92584d773f06 (diff) | |
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
* fix RAPL computations
# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAma83sIUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroO4OAf/SCiETP35wStOQ1MDfQoW9BUltlyS
# 0bHJ9fiVPUs8iVXoUOY83P33dBYLpkAutmdw38pxD9JDH99wM5e4Etgks1GxLjtj
# aDWMyxskguVKxR0iT92jcM7kFZKYqzssIoXrPFq7cC4LYw9t5wOEUnPxRXBphlao
# 1lLdkJlDzHsU/K+VSAdB81T/Og+E6BpcBZTLD9EONUvcqHSiGp65omNf+dPporkO
# U2egOFqcbhH6+jdQoRwBeXvGnIny8nHLVyOEbZWygeZqfo2PWR5PQ3DqOR7sj5RT
# w9DIxtkpMdHWT1D/+8etDnb3XWYRnZNLhK5B3w4HpZUcBecyxmcXj6nxXA==
# =Uvzx
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 15 Aug 2024 02:43:46 AM AEST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
target/i386: Fix arguments for vmsr_read_thread_stat()
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | target/i386/kvm/kvm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 31f149c990..2fa88ef1e3 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2712,8 +2712,8 @@ static void *kvm_msr_energy_thread(void *data) thd_stat[i].thread_id = thread_ids[i]; vmsr_read_thread_stat(vmsr->pid, thd_stat[i].thread_id, - thd_stat[i].utime, - thd_stat[i].stime, + &thd_stat[i].utime[0], + &thd_stat[i].stime[0], &thd_stat[i].cpu_id); thd_stat[i].pkg_id = vmsr_get_physical_package_id(thd_stat[i].cpu_id); @@ -2777,8 +2777,8 @@ static void *kvm_msr_energy_thread(void *data) for (int i = 0; i < num_threads; i++) { vmsr_read_thread_stat(vmsr->pid, thd_stat[i].thread_id, - thd_stat[i].utime, - thd_stat[i].stime, + &thd_stat[i].utime[1], + &thd_stat[i].stime[1], &thd_stat[i].cpu_id); if (vmsr->pid < 0) { |