path: root/arch
diff options
authorMarc Zyngier <marc.zyngier@arm.com>2017-03-27 17:03:45 +0100
committerChristoffer Dall <cdall@linaro.org>2017-04-09 07:49:17 -0700
commit9d0d4d34d9b527a1514d32836708be31f54c3c0b (patch)
treee67399f709e2bfd3a784e71db2e38d94dc91d280 /arch
parentarm: KVM: Make unexpected register accesses inject an undef (diff)
arm: KVM: Treat CP15 accessors returning false as successful
Instead of considering that a CP15 accessor has failed when returning false, let's consider that it is *always* successful (after all, we won't stand for an incomplete emulation). The return value now simply indicates whether we should skip the instruction (because it has now been emulated), or if we should leave the PC alone if the emulation has injected an exception. Reviewed-by: Christoffer Dall <cdall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to '')
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 519aac12b365..2c14b69511e9 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -520,15 +520,15 @@ static int emulate_cp15(struct kvm_vcpu *vcpu,
if (likely(r->access(vcpu, params, r))) {
/* Skip instruction, since it was emulated */
kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
- return 1;
- /* If access function fails, it should complain. */
} else {
+ /* If access function fails, it should complain. */
kvm_err("Unsupported guest CP15 access at: %08lx\n",
+ kvm_inject_undefined(vcpu);
- kvm_inject_undefined(vcpu);
return 1;