diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-22 11:15:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-22 12:51:05 +0000 |
| commit | 28aa2be47924f6b971a6d323b3b4083228c8214f (patch) | |
| tree | 0a8b1ee3d68f262338fb2e9e17badc3557f4f8c4 /arch/x86/kvm/x86.c | |
| parent | a6b8ad1106ba7e875e1ea94657f19eb0636ce0b2 (diff) | |
| parent | 1f0f80ecae848b0ca2ca632e94568721494f09f0 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.11
Conflicts:
include/linux/radix-tree.h
kernel/rcu/tree.c
mm/filemap.c
mm/page_alloc.c
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 3fe310c05994..023b5ac94807 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4911,7 +4911,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; |