diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-21 18:53:19 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-21 18:53:19 +0000 |
commit | 09cc926e9a6002790e69ed213217ef9874888624 (patch) | |
tree | d97960db291ce620a9ee216b4d3cafd6f38ee2d3 /arch/x86/kvm/x86.c | |
parent | d18b9ba808322f843375c262a7df889ff406a71c (diff) | |
parent | 252f23ea5987a4730e3399ef1ad5d78efcc786c9 (diff) |
Merge tag 'v3.10.61' into linux-linaro-lsk
This is the 3.10.61 stable release
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index dd894d4859a8..ce20cb65de58 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4837,7 +4837,7 @@ static int handle_emulation_failure(struct kvm_vcpu *vcpu) ++vcpu->stat.insn_emulation_fail; trace_kvm_emulate_insn_failed(vcpu); - if (!is_guest_mode(vcpu)) { + if (!is_guest_mode(vcpu) && kvm_x86_ops->get_cpl(vcpu) == 0) { vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR; vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION; vcpu->run->internal.ndata = 0; |