> On 3 Sep 2025, at 12.06, Philippe Mathieu-Daudé <phi...@linaro.org> wrote:
>
> Call hv_vcpu_destroy() to destroy our vCPU context.
>
> As hv_vcpu_destroy() must be called by the owning thread,
> document hvf_arch_vcpu_destroy() also does.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
> ---
> include/system/hvf_int.h | 3 ++-
> target/arm/hvf/hvf.c | 4 ++++
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/include/system/hvf_int.h b/include/system/hvf_int.h
> index 241c668795e..195d64dcf18 100644
> --- a/include/system/hvf_int.h
> +++ b/include/system/hvf_int.h
> @@ -71,13 +71,14 @@ void assert_hvf_ok_impl(hv_return_t ret, const char
> *file, unsigned int line,
> const char *hvf_return_string(hv_return_t ret);
> int hvf_arch_init(void);
> hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range);
> -void hvf_arch_vcpu_destroy(CPUState *cpu);
> hvf_slot *hvf_find_overlap_slot(uint64_t, uint64_t);
> void hvf_kick_vcpu_thread(CPUState *cpu);
>
> /* Must be called by the owning thread */
> int hvf_arch_init_vcpu(CPUState *cpu);
> /* Must be called by the owning thread */
> +void hvf_arch_vcpu_destroy(CPUState *cpu);
> +/* Must be called by the owning thread */
> int hvf_arch_vcpu_exec(CPUState *);
> /* Must be called by the owning thread */
> int hvf_arch_put_registers(CPUState *);
> diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
> index 4a535d65b7e..5b3c34014a5 100644
> --- a/target/arm/hvf/hvf.c
> +++ b/target/arm/hvf/hvf.c
> @@ -992,6 +992,10 @@ void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu)
>
> void hvf_arch_vcpu_destroy(CPUState *cpu)
> {
> + hv_return_t ret;
> +
> + ret = hv_vcpu_destroy(cpu->accel->fd);
> + assert_hvf_ok(ret);
Interesting that this was missing. I can see x86 is missing it too.
> }
>
> hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range)
> --
> 2.51.0
>
Reviewed-by: Mads Ynddal <m...@ynddal.dk>
