[Xen-changelog] [xen-unstable] vmx: Change xen macro name for Intel vmexit reason 41

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1244190723 -3600
# Node ID 6eff3fe96aff468487a9205a7cd344aaf7d4b5e1
# Parent  9f4c5734e4aa014e062ddfdf7ed3763790b8e619
vmx: Change xen macro name for Intel vmexit reason 41

This VMEXIT (reason 41) indicates MCE during a VMENTRY, the old macro
definition is misleading us.

Signed-off-by: Dongxiao Xu <dongxiao.xu@xxxxxxxxx>
---
 xen/arch/x86/hvm/vmx/vmx.c        |    4 ++--
 xen/include/asm-x86/hvm/vmx/vmx.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 9f4c5734e4aa -r 6eff3fe96aff xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Fri Jun 05 09:31:23 2009 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Fri Jun 05 09:32:03 2009 +0100
@@ -2220,7 +2220,7 @@ static void vmx_failed_vmentry(unsigned 
     case EXIT_REASON_MSR_LOADING:
         printk("caused by MSR entry %ld loading.\n", exit_qualification);
         break;
-    case EXIT_REASON_MACHINE_CHECK:
+    case EXIT_REASON_MCE_DURING_VMENTRY:
         printk("caused by machine check.\n");
         HVMTRACE_0D(MCE);
         do_machine_check(regs);
@@ -2340,7 +2340,7 @@ asmlinkage void vmx_vmexit_handler(struc
         case EXIT_REASON_SIPI:
         case EXIT_REASON_PENDING_VIRT_INTR:
         case EXIT_REASON_PENDING_VIRT_NMI:
-        case EXIT_REASON_MACHINE_CHECK:
+        case EXIT_REASON_MCE_DURING_VMENTRY:
             break;
         default:
             v->arch.hvm_vmx.vmx_emulate = 1;
diff -r 9f4c5734e4aa -r 6eff3fe96aff xen/include/asm-x86/hvm/vmx/vmx.h
--- a/xen/include/asm-x86/hvm/vmx/vmx.h Fri Jun 05 09:31:23 2009 +0100
+++ b/xen/include/asm-x86/hvm/vmx/vmx.h Fri Jun 05 09:32:03 2009 +0100
@@ -105,7 +105,7 @@ void vmx_update_debug_state(struct vcpu 
 #define EXIT_REASON_MONITOR_TRAP_FLAG   37
 #define EXIT_REASON_MONITOR_INSTRUCTION 39
 #define EXIT_REASON_PAUSE_INSTRUCTION   40
-#define EXIT_REASON_MACHINE_CHECK       41
+#define EXIT_REASON_MCE_DURING_VMENTRY  41
 #define EXIT_REASON_TPR_BELOW_THRESHOLD 43
 #define EXIT_REASON_APIC_ACCESS         44
 #define EXIT_REASON_EPT_VIOLATION       48

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog