Skip to contentSkip to conversation

target/arm: Remove target_ulong use in hvf_handle_psci_call()

PATCH Applied Philippe Mathieu-Daudé 2 participants 2 messages Apr 10 – Apr 15

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 target/arm: Remove target_ulong use in hvf_handle_psci_call()

Similarly to commit 3580aa03547 ("target/arm/tcg/psci.c: make compilation unit common") which replaced the target_ulong use in arm_handle_psci_call(), replace the one in hvf_handle_psci_call.

This could be vaddr, because entry is the start pc for the on-lining cpu, but we prefer uint64_t because this is what we get in param[] and pass to arm_set_cpu_on().

---
 target/arm/hvf/hvf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/arm/hvf/hvf.c +1 -1
index 5fc8f6bbbd9..678afe5c8e1 100644
@@ -1418,7 +1418,7 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *excp_ret)
     bool target_aarch64 = true;
     CPUState *target_cpu_state;
     ARMCPU *target_cpu;
-    target_ulong entry;
+    uint64_t entry;
     int target_el = 1;
     int32_t ret = 0;
 
Signature · 1 line
2.53.0
#1 lore raw
Quoted 5 lines · Philippe Mathieu-Daudé

Similarly to commit 3580aa03547 ("target/arm/tcg/psci.c: make compilation unit common") which replaced the target_ulong use in arm_handle_psci_call(), replace the one in hvf_handle_psci_call.

Quoted 7 lines

This could be vaddr, because entry is the start pc for the on-lining cpu, but we prefer uint64_t because this is what we get in param[] and pass to arm_set_cpu_on().

Applied to target-arm.next for 11.1, thanks.

-- PMM