ia64/xen-unstable

changeset 19737:6eff3fe96aff

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@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Jun 05 09:32:03 2009 +0100 (2009-06-05)
parents 9f4c5734e4aa
children 8dd5c3cae086
files xen/arch/x86/hvm/vmx/vmx.c xen/include/asm-x86/hvm/vmx/vmx.h
line diff
     1.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Fri Jun 05 09:31:23 2009 +0100
     1.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Fri Jun 05 09:32:03 2009 +0100
     1.3 @@ -2220,7 +2220,7 @@ static void vmx_failed_vmentry(unsigned 
     1.4      case EXIT_REASON_MSR_LOADING:
     1.5          printk("caused by MSR entry %ld loading.\n", exit_qualification);
     1.6          break;
     1.7 -    case EXIT_REASON_MACHINE_CHECK:
     1.8 +    case EXIT_REASON_MCE_DURING_VMENTRY:
     1.9          printk("caused by machine check.\n");
    1.10          HVMTRACE_0D(MCE);
    1.11          do_machine_check(regs);
    1.12 @@ -2340,7 +2340,7 @@ asmlinkage void vmx_vmexit_handler(struc
    1.13          case EXIT_REASON_SIPI:
    1.14          case EXIT_REASON_PENDING_VIRT_INTR:
    1.15          case EXIT_REASON_PENDING_VIRT_NMI:
    1.16 -        case EXIT_REASON_MACHINE_CHECK:
    1.17 +        case EXIT_REASON_MCE_DURING_VMENTRY:
    1.18              break;
    1.19          default:
    1.20              v->arch.hvm_vmx.vmx_emulate = 1;
     2.1 --- a/xen/include/asm-x86/hvm/vmx/vmx.h	Fri Jun 05 09:31:23 2009 +0100
     2.2 +++ b/xen/include/asm-x86/hvm/vmx/vmx.h	Fri Jun 05 09:32:03 2009 +0100
     2.3 @@ -105,7 +105,7 @@ void vmx_update_debug_state(struct vcpu 
     2.4  #define EXIT_REASON_MONITOR_TRAP_FLAG   37
     2.5  #define EXIT_REASON_MONITOR_INSTRUCTION 39
     2.6  #define EXIT_REASON_PAUSE_INSTRUCTION   40
     2.7 -#define EXIT_REASON_MACHINE_CHECK       41
     2.8 +#define EXIT_REASON_MCE_DURING_VMENTRY  41
     2.9  #define EXIT_REASON_TPR_BELOW_THRESHOLD 43
    2.10  #define EXIT_REASON_APIC_ACCESS         44
    2.11  #define EXIT_REASON_EPT_VIOLATION       48