[PULL 0/1] Accelerators patches for 2025-12-01

[PULL 0/1] Accelerators patches for 2025-12-01

[Philippe Mathieu-Daudé]

The following changes since commit 9ef49528b5286f078061b52ac41e0ca19fa10e36:

  Merge tag 'hw-misc-20251125' of https://github.com/philmd/qemu into staging (2025-11-25 14:22:39 -0800)

are available in the Git repository at:

  https://github.com/philmd/qemu.git tags/accel-20251201

for you to fetch changes up to 3bee93b9abf5509f1ac25909478dd52a724bf0c3:

  accel/hvf: Fix i386 HVF compilation failures (2025-12-01 21:21:16 +0100)

Spurious checkpatch.pl warning:

  WARNING: architecture specific defines should be avoided
  #49: FILE: accel/hvf/hvf-accel-ops.c:151:
  +#ifdef __aarch64__

----------------------------------------------------------------
Accelerators patches queue

- Fix HVF/x86 build
----------------------------------------------------------------

Nguyen Dinh Phi (1):
  accel/hvf: Fix i386 HVF compilation failures

 accel/hvf/hvf-accel-ops.c | 5 ++---
 target/i386/hvf/hvf.c     | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

-- 
2.51.0

[PULL 1/1] accel/hvf: Fix i386 HVF compilation failures

[Philippe Mathieu-Daudé]

From: Nguyen Dinh Phi <phind.uet@gmail.com>

Recent changes introduced build errors in the i386 HVF backend:

 - ../accel/hvf/hvf-accel-ops.c:163:17: error: no member named 'guest_debug_enabled' in 'struct AccelCPUState'
   163 |     cpu->accel->guest_debug_enabled = false;

 - ../accel/hvf/hvf-accel-ops.c:151:51
   error: no member named 'unblock_ipi_mask' in 'struct AccelCPUState'

 - ../target/i386/hvf/hvf.c:736:5
   error: use of undeclared identifier 'rip'

 - ../target/i386/hvf/hvf.c:737:5
   error: use of undeclared identifier 'env'

This patch corrects the field usage and move identifier to correct
function ensuring successful compilation of the i386 HVF backend.

These issues were caused by:

Fixes: 2ad756383e1b (“accel/hvf: Restrict ARM-specific fields of AccelCPUState”)
Fixes: 2a21c9244740 (“target/i386/hvf: Factor hvf_handle_vmexit() out”)

Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20251126094601.56403-1-phind.uet@gmail.com>
[PMD: Keep setting vcpu_dirty on AArch64]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Nguyen Dinh Phi <phind.uet@gmail.com>
Message-Id: <20251128085854.53539-1-phind.uet@gmail.com>
---
 accel/hvf/hvf-accel-ops.c | 5 ++---
 target/i386/hvf/hvf.c     | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c
index 3e5feecd8a7..e4c62522e10 100644
--- a/accel/hvf/hvf-accel-ops.c
+++ b/accel/hvf/hvf-accel-ops.c
@@ -148,10 +148,11 @@ static int hvf_init_vcpu(CPUState *cpu)
     sigact.sa_handler = dummy_signal;
     sigaction(SIG_IPI, &sigact, NULL);
 
+#ifdef __aarch64__
     pthread_sigmask(SIG_BLOCK, NULL, &cpu->accel->unblock_ipi_mask);
     sigdelset(&cpu->accel->unblock_ipi_mask, SIG_IPI);
+    cpu->accel->guest_debug_enabled = false;
 
-#ifdef __aarch64__
     r = hv_vcpu_create(&cpu->accel->fd,
                        (hv_vcpu_exit_t **)&cpu->accel->exit, NULL);
 #else
@@ -160,8 +161,6 @@ static int hvf_init_vcpu(CPUState *cpu)
     assert_hvf_ok(r);
     cpu->vcpu_dirty = true;
 
-    cpu->accel->guest_debug_enabled = false;
-
     return hvf_arch_init_vcpu(cpu);
 }
 
diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index 16febbac48f..2023a7bfbb0 100644
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -728,7 +728,8 @@ static int hvf_handle_vmexit(CPUState *cpu)
     uint64_t exit_qual = rvmcs(cpu->accel->fd, VMCS_EXIT_QUALIFICATION);
     uint32_t ins_len = (uint32_t)rvmcs(cpu->accel->fd,
                                        VMCS_EXIT_INSTRUCTION_LENGTH);
-
+    CPUX86State *env = &x86_cpu->env;
+    uint64_t rip = 0;
     uint64_t idtvec_info = rvmcs(cpu->accel->fd, VMCS_IDT_VECTORING_INFO);
     int ret = 0;
 
@@ -966,10 +967,7 @@ static int hvf_handle_vmexit(CPUState *cpu)
 
 int hvf_arch_vcpu_exec(CPUState *cpu)
 {
-    X86CPU *x86_cpu = X86_CPU(cpu);
-    CPUX86State *env = &x86_cpu->env;
     int ret = 0;
-    uint64_t rip = 0;
 
     if (hvf_process_events(cpu)) {
         return EXCP_HLT;
-- 
2.51.0

Re: [PULL 0/1] Accelerators patches for 2025-12-01

[Richard Henderson]

On 12/1/25 12:26, Philippe Mathieu-Daudé wrote:
> The following changes since commit 9ef49528b5286f078061b52ac41e0ca19fa10e36:
> 
>    Merge tag 'hw-misc-20251125' of https://github.com/philmd/qemu into staging (2025-11-25 14:22:39 -0800)
> 
> are available in the Git repository at:
> 
>    https://github.com/philmd/qemu.git tags/accel-20251201
> 
> for you to fetch changes up to 3bee93b9abf5509f1ac25909478dd52a724bf0c3:
> 
>    accel/hvf: Fix i386 HVF compilation failures (2025-12-01 21:21:16 +0100)
> 
> Spurious checkpatch.pl warning:
> 
>    WARNING: architecture specific defines should be avoided
>    #49: FILE: accel/hvf/hvf-accel-ops.c:151:
>    +#ifdef __aarch64__
> 
> ----------------------------------------------------------------
> Accelerators patches queue
> 
> - Fix HVF/x86 build
> ----------------------------------------------------------------
> 
> Nguyen Dinh Phi (1):
>    accel/hvf: Fix i386 HVF compilation failures
> 
>   accel/hvf/hvf-accel-ops.c | 5 ++---
>   target/i386/hvf/hvf.c     | 6 ++----
>   2 files changed, 4 insertions(+), 7 deletions(-)
> 


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

r~