From: Nguyen Dinh Phi <[email protected]> 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 <[email protected]> --- V2: Move #ifdef to only cover the accel field --- accel/hvf/hvf-accel-ops.c | 5 +++-- target/i386/hvf/hvf.c | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index 3e5feecd8a..54ead44ae6 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -148,10 +148,10 @@ 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); -#ifdef __aarch64__ r = hv_vcpu_create(&cpu->accel->fd, (hv_vcpu_exit_t **)&cpu->accel->exit, NULL); #else @@ -159,8 +159,9 @@ static int hvf_init_vcpu(CPUState *cpu) #endif assert_hvf_ok(r); cpu->vcpu_dirty = true; - +#ifdef __aarch64__ cpu->accel->guest_debug_enabled = false; +#endif return hvf_arch_init_vcpu(cpu); } diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 16febbac48..2023a7bfbb 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.50.1 (Apple Git-155)
