|
@@ -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",
|
|
|
*vcpu_pc(vcpu));
|
|
|
print_cp_instr(params);
|
|
|
+ kvm_inject_undefined(vcpu);
|
|
|
}
|
|
|
- kvm_inject_undefined(vcpu);
|
|
|
+
|
|
|
return 1;
|
|
|
}
|
|
|
|