summaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm
diff options
context:
space:
mode:
authorMarc Zyngier2018-12-20 14:07:40 +0100
committerMarc Zyngier2019-02-07 12:44:46 +0100
commit20589c8cc47dce5854c8bf1b44a9fc63d798d26d (patch)
treee2964730b98027a8a1afc7586f133a601fdaab4f /arch/arm/kvm
parentarm/arm64: KVM: Allow a VCPU to fully reset itself (diff)
downloadkernel-qcow2-linux-20589c8cc47dce5854c8bf1b44a9fc63d798d26d.tar.gz
kernel-qcow2-linux-20589c8cc47dce5854c8bf1b44a9fc63d798d26d.tar.xz
kernel-qcow2-linux-20589c8cc47dce5854c8bf1b44a9fc63d798d26d.zip
arm/arm64: KVM: Don't panic on failure to properly reset system registers
Failing to properly reset system registers is pretty bad. But not quite as bad as bringing the whole machine down... So warn loudly, but slightly more gracefully. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Christoffer Dall <christoffer.dall@arm.com>
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r--arch/arm/kvm/coproc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 222c1635bc7a..e8bd288fd5be 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -1450,6 +1450,6 @@ void kvm_reset_coprocs(struct kvm_vcpu *vcpu)
reset_coproc_regs(vcpu, table, num);
for (num = 1; num < NR_CP15_REGS; num++)
- if (vcpu_cp15(vcpu, num) == 0x42424242)
- panic("Didn't reset vcpu_cp15(vcpu, %zi)", num);
+ WARN(vcpu_cp15(vcpu, num) == 0x42424242,
+ "Didn't reset vcpu_cp15(vcpu, %zi)", num);
}