commit 4695daacc068cd0aa9a91c0063c4f2a9ec9b7ba1
author Philippe Mathieu-Daudé <philmd@linaro.org> Tue Oct 28 06:42:03 2025 +0100
committer Peter Maydell <peter.maydell@linaro.org> Fri Oct 31 16:26:46 2025 +0000
tree 6c10cad1f0c2fa55fd16cba5f176b80911253b23
parent 6d1a5105eeb7e1fc7f052007923306975f4f85e9

target/arm: Re-use arm_is_psci_call() in HVF

Re-use arm_is_psci_call() instead of open-coding it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

target/arm/hvf/hvf.c

diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index 26bafee..a3bb71e 100644
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -1934,7 +1934,7 @@
         break;
     case EC_AA64_HVC:
         cpu_synchronize_state(cpu);
-        if (arm_cpu->psci_conduit == QEMU_PSCI_CONDUIT_HVC) {
+        if (arm_is_psci_call(arm_cpu, EXCP_HVC)) {
             if (!hvf_handle_psci_call(cpu)) {
                 trace_hvf_unknown_hvc(env->pc, env->xregs[0]);
                 /* SMCCC 1.3 section 5.2 says every unknown SMCCC call returns -1 */
@@ -1947,7 +1947,7 @@
         break;
     case EC_AA64_SMC:
         cpu_synchronize_state(cpu);
-        if (arm_cpu->psci_conduit == QEMU_PSCI_CONDUIT_SMC) {
+        if (arm_is_psci_call(arm_cpu, EXCP_SMC)) {
             advance_pc = true;
 
             if (!hvf_handle_psci_call(cpu)) {