[v1] Fix i386 HVF compilation failures

[PATCH] Fix i386 HVF compilation failures

Posted by phind.uet@gmail.com 2 months, 1 week ago

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>
---
 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..e2cb8f202b 100644
--- a/accel/hvf/hvf-accel-ops.c
+++ b/accel/hvf/hvf-accel-ops.c
@@ -148,19 +148,20 @@ 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
     r = hv_vcpu_create(&cpu->accel->fd, HV_VCPU_DEFAULT);
 #endif
     assert_hvf_ok(r);
+#ifdef __aarch64__
     cpu->vcpu_dirty = true;
-
     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)

Re: [PATCH] Fix i386 HVF compilation failures

Posted by Philippe Mathieu-Daudé 2 months, 1 week ago

On 26/11/25 10:46, phind.uet@gmail.com wrote:
> 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”)

Oops.

> 
> Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com>
> ---
>   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..e2cb8f202b 100644
> --- a/accel/hvf/hvf-accel-ops.c
> +++ b/accel/hvf/hvf-accel-ops.c
> @@ -148,19 +148,20 @@ 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
>       r = hv_vcpu_create(&cpu->accel->fd, HV_VCPU_DEFAULT);
>   #endif
>       assert_hvf_ok(r);
> +#ifdef __aarch64__
>       cpu->vcpu_dirty = true;

Don't we want the ifdef *after* this line?

> -
>       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;

Otherwise:

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH] Fix i386 HVF compilation failures

Posted by Nguyen Dinh Phi [SG] 2 months, 1 week ago

On 26/11/25 9:39 pm, Philippe Mathieu-Daudé wrote:
> On 26/11/25 10:46, phind.uet@gmail.com wrote:
>> 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”)
> 
> Oops.
> 
>>
>> Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com>
>> ---
>>   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..e2cb8f202b 100644
>> --- a/accel/hvf/hvf-accel-ops.c
>> +++ b/accel/hvf/hvf-accel-ops.c
>> @@ -148,19 +148,20 @@ 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
>>       r = hv_vcpu_create(&cpu->accel->fd, HV_VCPU_DEFAULT);
>>   #endif
>>       assert_hvf_ok(r);
>> +#ifdef __aarch64__
>>       cpu->vcpu_dirty = true;
> 
> Don't we want the ifdef *after* this line?
Oops, that was acutally that I meant to do, I think I made mistake when 
formatting the code. I will send a new version to move the #ifdef line. 
Somehow the vm still work normally on my intel Macbook.

Thanks,
Phi

Re: [PATCH] Fix i386 HVF compilation failures

Posted by Philippe Mathieu-Daudé 2 months, 1 week ago

On 28/11/25 09:46, Nguyen Dinh Phi [SG] wrote:
> On 26/11/25 9:39 pm, Philippe Mathieu-Daudé wrote:
>> On 26/11/25 10:46, phind.uet@gmail.com wrote:
>>> 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”)
>>
>> Oops.
>>
>>>
>>> Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com>
>>> ---
>>>   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..e2cb8f202b 100644
>>> --- a/accel/hvf/hvf-accel-ops.c
>>> +++ b/accel/hvf/hvf-accel-ops.c
>>> @@ -148,19 +148,20 @@ 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
>>>       r = hv_vcpu_create(&cpu->accel->fd, HV_VCPU_DEFAULT);
>>>   #endif
>>>       assert_hvf_ok(r);
>>> +#ifdef __aarch64__
>>>       cpu->vcpu_dirty = true;
>>
>> Don't we want the ifdef *after* this line?
> Oops, that was acutally that I meant to do, I think I made mistake when 
> formatting the code. I will send a new version to move the #ifdef line. 
> Somehow the vm still work normally on my intel Macbook.

Does that mean you tested this patch and it works for you? I posted v2:
https://lore.kernel.org/qemu-devel/20251126134434.14355-1-philmd@linaro.org/
What do you plan to change with it?

Thanks,

Phil.

Re: [PATCH] Fix i386 HVF compilation failures

Posted by Nguyen Dinh Phi [SG] 2 months, 1 week ago

On 28/11/25 9:02 pm, Philippe Mathieu-Daudé wrote:
> On 28/11/25 09:46, Nguyen Dinh Phi [SG] wrote:
>> On 26/11/25 9:39 pm, Philippe Mathieu-Daudé wrote:
>>> On 26/11/25 10:46, phind.uet@gmail.com wrote:
>>>> 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”)
>>>
>>> Oops.
>>>
>>>>
>>>> Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com>
>>>> ---
>>>>   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..e2cb8f202b 100644
>>>> --- a/accel/hvf/hvf-accel-ops.c
>>>> +++ b/accel/hvf/hvf-accel-ops.c
>>>> @@ -148,19 +148,20 @@ 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
>>>>       r = hv_vcpu_create(&cpu->accel->fd, HV_VCPU_DEFAULT);
>>>>   #endif
>>>>       assert_hvf_ok(r);
>>>> +#ifdef __aarch64__
>>>>       cpu->vcpu_dirty = true;
>>>
>>> Don't we want the ifdef *after* this line?
>> Oops, that was acutally that I meant to do, I think I made mistake 
>> when formatting the code. I will send a new version to move the #ifdef 
>> line. Somehow the vm still work normally on my intel Macbook.
> 
> Does that mean you tested this patch and it works for you? I posted v2:
> https://lore.kernel.org/qemu-devel/20251126134434.14355-1- 
> philmd@linaro.org/
Aw, sorry, I didn't aware of this.
> What do you plan to change with it?
Generally,it is them same as your post.
Yes, I tested my patch and it works fine, however, my original plan was to
make the change similar to what you posted. I tried your patch too, and it
works as expected, I think your patch does it better.

Thanks,
Phi