From: Alex Bennée <alex.bennee@linaro.org>
Date: Tue, 9 Dec 2025 09:24:58 +0000 (+0000)
Subject: target/arm: make HV_EXIT_REASON_CANCELED leave hvf_arch_vcpu_exec
X-Git-Tag: v10.2.0-rc3~2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d10019372467edac05b783deff7fa9ef830545d7;p=thirdparty%2Fqemu.git

target/arm: make HV_EXIT_REASON_CANCELED leave hvf_arch_vcpu_exec

Without this we can spin tightly in the main HVF dispatch loop and
never release the lock long enough. As a result the HMP never gets to
run and shutting down the system deadlocks.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3228
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20251209092459.1058313-4-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---

diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index 8e2940217a..8288b60529 100644
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -2020,6 +2020,7 @@ static int hvf_handle_vmexit(CPUState *cpu, hv_vcpu_exit_t *exit)
         break;
     case HV_EXIT_REASON_CANCELED:
         /* we got kicked, no exit to process */
+        ret = -1;
         break;
     default:
         g_assert_not_reached();