diff options
| author | Gavin Shan <gshan@redhat.com> | 2020-06-30 11:57:05 +1000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-07-05 21:57:59 +0100 |
| commit | 3a949f4c93548751a377691b2a208063da05e369 (patch) | |
| tree | 15e1bb7211b4d29b466e22bf516ccdcd46413c3b /arch/arm64/kvm/hyp/aarch32.c | |
| parent | 95fa0ba83e66dea0d3af48ad69842ae8c1dd9af2 (diff) | |
| download | lwn-3a949f4c93548751a377691b2a208063da05e369.tar.gz lwn-3a949f4c93548751a377691b2a208063da05e369.zip | |
KVM: arm64: Rename HSR to ESR
kvm/arm32 isn't supported since commit 541ad0150ca4 ("arm: Remove
32bit KVM host support"). So HSR isn't meaningful since then. This
renames HSR to ESR accordingly. This shouldn't cause any functional
changes:
* Rename kvm_vcpu_get_hsr() to kvm_vcpu_get_esr() to make the
function names self-explanatory.
* Rename variables from @hsr to @esr to make them self-explanatory.
Note that the renaming on uapi and tracepoint will cause ABI changes,
which we should avoid. Specificly, there are 4 related source files
in this regard:
* arch/arm64/include/uapi/asm/kvm.h (struct kvm_debug_exit_arch::hsr)
* arch/arm64/kvm/handle_exit.c (struct kvm_debug_exit_arch::hsr)
* arch/arm64/kvm/trace_arm.h (tracepoints)
* arch/arm64/kvm/trace_handle_exit.h (tracepoints)
Signed-off-by: Gavin Shan <gshan@redhat.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Andrew Scull <ascull@google.com>
Link: https://lore.kernel.org/r/20200630015705.103366-1-gshan@redhat.com
Diffstat (limited to 'arch/arm64/kvm/hyp/aarch32.c')
| -rw-r--r-- | arch/arm64/kvm/hyp/aarch32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/aarch32.c b/arch/arm64/kvm/hyp/aarch32.c index 25c0e47d57cb..1e948704d60f 100644 --- a/arch/arm64/kvm/hyp/aarch32.c +++ b/arch/arm64/kvm/hyp/aarch32.c @@ -51,7 +51,7 @@ bool __hyp_text kvm_condition_valid32(const struct kvm_vcpu *vcpu) int cond; /* Top two bits non-zero? Unconditional. */ - if (kvm_vcpu_get_hsr(vcpu) >> 30) + if (kvm_vcpu_get_esr(vcpu) >> 30) return true; /* Is condition field valid? */ |