[PULL 0/1] target/i386 patch for QEMU 9.1

[PULL 0/1] target/i386 patch for QEMU 9.1

[Paolo Bonzini]

The following changes since commit 3ef11c991e501768f2fa646e8438f075be1cd2f5:

  po: update Italian translation (2024-08-13 19:01:42 +0200)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to a6e65975c3fac1b2f067fef8eeed92584d773f06:

  target/i386: Fix arguments for vmsr_read_thread_stat() (2024-08-14 18:42:19 +0200)

Sorry, this one fell through the cracks.

----------------------------------------------------------------
* fix RAPL computations

----------------------------------------------------------------
Anthony Harivel (1):
      target/i386: Fix arguments for vmsr_read_thread_stat()

 target/i386/kvm/kvm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
-- 
2.46.0

[PULL 1/1] target/i386: Fix arguments for vmsr_read_thread_stat()

[Paolo Bonzini]

From: Anthony Harivel <aharivel@redhat.com>

Snapshot of the stat utime and stime for each thread, taken before and
after the pause, must be stored in separate locations

Signed-off-by: Anthony Harivel <aharivel@redhat.com>
Link: https://lore.kernel.org/r/20240807124320.1741124-2-aharivel@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 target/i386/kvm/kvm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 31f149c9902..2fa88ef1e37 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) {
-- 
2.46.0

Re: [PULL 0/1] target/i386 patch for QEMU 9.1

[Richard Henderson]

On 8/15/24 02:44, Paolo Bonzini wrote:
> The following changes since commit 3ef11c991e501768f2fa646e8438f075be1cd2f5:
> 
>    po: update Italian translation (2024-08-13 19:01:42 +0200)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/bonzini/qemu.git tags/for-upstream
> 
> for you to fetch changes up to a6e65975c3fac1b2f067fef8eeed92584d773f06:
> 
>    target/i386: Fix arguments for vmsr_read_thread_stat() (2024-08-14 18:42:19 +0200)
> 
> Sorry, this one fell through the cracks.
> 
> ----------------------------------------------------------------
> * fix RAPL computations

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.

r~