motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/arm/kvm: Have kvm_arm_handle_dabt_nisv take a ARMCPU argument

Browse source 
Unify the "kvm_arm.h" API: All functions related to ARM vCPUs
take a ARMCPU* argument. Use the CPU() QOM cast macro When
calling the generic vCPU API from "sysemu/kvm.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-id: 20231123183518.64569-15-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-12-19 17:57:47 +00:00 • committed by Peter Maydell
parent ca0d1b7ca4
commit 3187e06a82
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
target/arm/kvm.c
View file

@ -1302,17 +1302,16 @@ static void kvm_arm_vm_state_change(void *opaque, bool running, RunState state)
/** /**
* kvm_arm_handle_dabt_nisv: * kvm_arm_handle_dabt_nisv:
* @cs: CPUState * @cpu: ARMCPU
* @esr_iss: ISS encoding (limited) for the exception from Data Abort * @esr_iss: ISS encoding (limited) for the exception from Data Abort
* ISV bit set to '0b0' -> no valid instruction syndrome * ISV bit set to '0b0' -> no valid instruction syndrome
* @fault_ipa: faulting address for the synchronous data abort * @fault_ipa: faulting address for the synchronous data abort
* *
* Returns: 0 if the exception has been handled, < 0 otherwise * Returns: 0 if the exception has been handled, < 0 otherwise
*/ */
static int kvm_arm_handle_dabt_nisv(CPUState *cs, uint64_t esr_iss, static int kvm_arm_handle_dabt_nisv(ARMCPU *cpu, uint64_t esr_iss,
uint64_t fault_ipa) uint64_t fault_ipa)
{ {
ARMCPU *cpu = ARM_CPU(cs);
CPUARMState *env = &cpu->env; CPUARMState *env = &cpu->env;
/* /*
* Request KVM to inject the external data abort into the guest * Request KVM to inject the external data abort into the guest
@ -1328,7 +1327,7 @@ static int kvm_arm_handle_dabt_nisv(CPUState *cs, uint64_t esr_iss,
*/ */
events.exception.ext_dabt_pending = 1; events.exception.ext_dabt_pending = 1;
/* KVM_CAP_ARM_INJECT_EXT_DABT implies KVM_CAP_VCPU_EVENTS */ /* KVM_CAP_ARM_INJECT_EXT_DABT implies KVM_CAP_VCPU_EVENTS */
if (!kvm_vcpu_ioctl(cs, KVM_SET_VCPU_EVENTS, &events)) { if (!kvm_vcpu_ioctl(CPU(cpu), KVM_SET_VCPU_EVENTS, &events)) {
env->ext_dabt_raised = 1; env->ext_dabt_raised = 1;
return 0; return 0;
} }
@ -1420,6 +1419,7 @@ static bool kvm_arm_handle_debug(CPUState *cs,
int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
{ {
ARMCPU *cpu = ARM_CPU(cs);
int ret = 0; int ret = 0;
switch (run->exit_reason) { switch (run->exit_reason) {
@ -1430,7 +1430,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
break; break;
case KVM_EXIT_ARM_NISV: case KVM_EXIT_ARM_NISV:
/* External DABT with no valid iss to decode */ /* External DABT with no valid iss to decode */
ret = kvm_arm_handle_dabt_nisv(cs, run->arm_nisv.esr_iss, ret = kvm_arm_handle_dabt_nisv(cpu, run->arm_nisv.esr_iss,
run->arm_nisv.fault_ipa); run->arm_nisv.fault_ipa);
break; break;
default: default: