Skip to content

Commit c9a636f

Browse files
willdeaconMarc Zyngier
authored andcommitted
KVM: arm64: Rename kvm_vcpu_dabt_isextabt()
kvm_vcpu_dabt_isextabt() is not specific to data aborts and, unlike kvm_vcpu_dabt_issext(), has nothing to do with sign extension. Rename it to 'kvm_vcpu_abt_issea()'. Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Quentin Perret <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1ccf2fe commit c9a636f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

arch/arm64/include/asm/kvm_emulate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ static __always_inline u8 kvm_vcpu_trap_get_fault_type(const struct kvm_vcpu *vc
366366
return kvm_vcpu_get_esr(vcpu) & ESR_ELx_FSC_TYPE;
367367
}
368368

369-
static __always_inline bool kvm_vcpu_dabt_isextabt(const struct kvm_vcpu *vcpu)
369+
static __always_inline bool kvm_vcpu_abt_issea(const struct kvm_vcpu *vcpu)
370370
{
371371
switch (kvm_vcpu_trap_get_fault(vcpu)) {
372372
case FSC_SEA:

arch/arm64/kvm/hyp/switch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ static bool __hyp_text fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code)
594594
valid = kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_DABT_LOW &&
595595
kvm_vcpu_trap_get_fault_type(vcpu) == FSC_FAULT &&
596596
kvm_vcpu_dabt_isvalid(vcpu) &&
597-
!kvm_vcpu_dabt_isextabt(vcpu) &&
597+
!kvm_vcpu_abt_issea(vcpu) &&
598598
!kvm_vcpu_dabt_iss1tw(vcpu);
599599

600600
if (valid) {

arch/arm64/kvm/mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
20742074
is_iabt = kvm_vcpu_trap_is_iabt(vcpu);
20752075

20762076
/* Synchronous External Abort? */
2077-
if (kvm_vcpu_dabt_isextabt(vcpu)) {
2077+
if (kvm_vcpu_abt_issea(vcpu)) {
20782078
/*
20792079
* For RAS the host kernel may handle this abort.
20802080
* There is no need to pass the error into the guest.

0 commit comments

Comments
 (0)