From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 24 Nov 2016 15:36:13 +0000 (+0000)
Subject: x86/vmx: Don't deliver #MC with an error code
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~68
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=892d191df60806ea63f9d3c4fc37615bee028812;p=xen.git

x86/vmx: Don't deliver #MC with an error code

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Kevin Tian <kevin.tian@intel.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 0a52624994..7b2c50cf44 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -2915,7 +2915,7 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content)
 
         if ( (rc < 0) ||
              (msr_content && (vmx_add_host_load_msr(msr) < 0)) )
-            hvm_inject_hw_exception(TRAP_machine_check, 0);
+            hvm_inject_hw_exception(TRAP_machine_check, HVM_DELIVER_NO_ERROR_CODE);
         else
             __vmwrite(GUEST_IA32_DEBUGCTL, msr_content);