From patchwork Mon Nov 28 23:50:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 9450765 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7C4DC60235 for ; Mon, 28 Nov 2016 23:51:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6ED8727FA9 for ; Mon, 28 Nov 2016 23:51:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 639722808C; Mon, 28 Nov 2016 23:51:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C9DE27FA9 for ; Mon, 28 Nov 2016 23:50:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755862AbcK1Xu5 (ORCPT ); Mon, 28 Nov 2016 18:50:57 -0500 Received: from mail-pg0-f49.google.com ([74.125.83.49]:33556 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753647AbcK1Xuz (ORCPT ); Mon, 28 Nov 2016 18:50:55 -0500 Received: by mail-pg0-f49.google.com with SMTP id 3so62152929pgd.0 for ; Mon, 28 Nov 2016 15:50:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=2dtzxiDXlBR0OG8g1EXDT470vELX5TNEqNslLIHHEWE=; b=Br/GXjVW5frlEfv5SKyZTvPwmjgBWijqYr0d2CxsG7O+rAdLfwD1Pzr3mYJLuyRm7v GOxIYmcpxFCXi4Lv2pe5OBX5Mgcb/VKgpl1Xx+GGXW8k3PSZmqhyOo6SQ4r/ujPn766K 94DaFhaBEJUrm8Is8rB1RAGJigA+7HZwDPBhIn04YzkbNIz9IzjpESEQ3sxlHCt89IxK TafwLPYJ6bOLt4seKalD7/z+X0qFWI9Nq4QWReKbmjMicmEoE7L6eGs/jz1hiZYM7Gis Ig+lXHGHQ+OCZqMlaMa1YOmQZKJDcrUEymKNbbMADS4bTchwO5PiGHLROhBlZkDe8fjX 4iKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2dtzxiDXlBR0OG8g1EXDT470vELX5TNEqNslLIHHEWE=; b=gNxUy1iIm7nYX+nAcj7zfZ3IC6GmQSt4YV35sY+IW+iWI3s1RebyOyrnTQP0o1CYLa D2gxqZXkMHEwrx8Cz+nQjbhsuDRbMO9fdoW+eCjdTz80ZI1I6Z80vZsgxKIBytp0Syx7 i5YKp8pi3wCSqsoT0WEb7f2fxmpz6hEhIiertQUAYfKa31CvKPnJD2e8EDMbzOAIBxdi 46ddBq49nedYEn3rvdphrbBMvObKyNjAynp2HRzodV4VGt3KWRX+cC9opuWvrEyEXT0A 2StOWHdDj1p1rSyboEaiqt3PpXJ4aWC3thwr7HmTxwROgbHMIj0jWHyClwfBrrUDdQn7 XBqg== X-Gm-Message-State: AKaTC006+dwnsVYy9SQeMipW+ijY+fuxoFxfYXab6v0g7DpS0C/Ym519ubxE59Xi9v9h0qhZ X-Received: by 10.99.161.2 with SMTP id b2mr45543012pgf.2.1480377054576; Mon, 28 Nov 2016 15:50:54 -0800 (PST) Received: from jmattson.sea.corp.google.com ([100.100.206.154]) by smtp.gmail.com with ESMTPSA id y200sm84765930pfb.16.2016.11.28.15.50.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Nov 2016 15:50:54 -0800 (PST) From: Jim Mattson To: kvm@vger.kernel.org Cc: GanShun , Jim Mattson Subject: [PATCH] kvm: nVMX: Correct a VMX instruction error code for VMPTRLD Date: Mon, 28 Nov 2016 15:50:06 -0800 Message-Id: <1480377006-27404-1-git-send-email-jmattson@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: GanShun When the operand passed to VMPTRLD matches the address of the VMXON region, the VMX instruction error code should be VMXERR_VMPTRLD_VMXON_POINTER rather than VMXERR_VMCLEAR_VMXON_POINTER. Signed-off-by: Jim Mattson --- arch/x86/kvm/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 0c4cde8..7e3a45e 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6945,7 +6945,7 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason, if (vmptr == vmx->nested.vmxon_ptr) { nested_vmx_failValid(vcpu, - VMXERR_VMCLEAR_VMXON_POINTER); + VMXERR_VMPTRLD_VMXON_POINTER); skip_emulated_instruction(vcpu); return 1; }