diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-02-04 15:26:29 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-04-28 19:03:40 +0100 |
| commit | 5d7476c40cd352ec82aec26f6c6d8c413eb2b17b (patch) | |
| tree | 413bcc8902b8553520ea460df66fff0a4eb9cb27 | |
| parent | b9f3e457098ea76f2d69bfc369bae1fd0cf2a6e5 (diff) | |
| download | linux-stable-5d7476c40cd352ec82aec26f6c6d8c413eb2b17b.tar.gz | |
KVM: nVMX: Don't emulate instructions in guest mode
commit 07721feee46b4b248402133228235318199b05ec upstream.
vmx_check_intercept is not yet fully implemented. To avoid emulating
instructions disallowed by the L1 hypervisor, refuse to emulate
instructions by default.
[Made commit, added commit msg - Oliver]
Signed-off-by: Oliver Upton <oupton@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
[bwh: Backported to 3.16: adjust filename, context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index a1dbb20b768b1..1faaa78505f4a 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -8938,7 +8938,7 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu, struct x86_instruction_info *info, enum x86_intercept_stage stage) { - return X86EMUL_CONTINUE; + return X86EMUL_UNHANDLEABLE; } static struct kvm_x86_ops vmx_x86_ops = { |