1.1 --- a/xen/arch/x86/vmx.c	Mon Aug 22 11:04:05 2005 -0700
     1.2 +++ b/xen/arch/x86/vmx.c	Mon Aug 22 11:04:15 2005 -0700
     1.3 @@ -351,7 +351,7 @@ void stop_vmx(void)
     1.4   * Not all cases receive valid value in the VM-exit instruction length field.
     1.5   */
     1.6  #define __get_instruction_length(len) \
     1.7 -    __vmread(INSTRUCTION_LEN, &(len)); \
     1.8 +    __vmread(VM_EXIT_INSTRUCTION_LEN, &(len)); \
     1.9       if ((len) < 1 || (len) > 15) \
    1.10          __vmx_bug(&regs);
    1.11  
    1.12 @@ -389,7 +389,7 @@ static int vmx_do_page_fault(unsigned lo
    1.13      if ( mmio_space(gpa) ){
    1.14          if (gpa >= 0xFEE00000) { /* workaround for local APIC */
    1.15              u32 inst_len;
    1.16 -            __vmread(INSTRUCTION_LEN, &(inst_len));
    1.17 +            __vmread(VM_EXIT_INSTRUCTION_LEN, &(inst_len));
    1.18              __update_guest_eip(inst_len);
    1.19              return 1;
    1.20          }
    1.21 @@ -542,7 +542,7 @@ static int check_for_null_selector(unsig
    1.22      int i, inst_len;
    1.23      int inst_copy_from_guest(unsigned char *, unsigned long, int);
    1.24  
    1.25 -    __vmread(INSTRUCTION_LEN, &inst_len);
    1.26 +    __vmread(VM_EXIT_INSTRUCTION_LEN, &inst_len);
    1.27      memset(inst, 0, MAX_INST_LEN);
    1.28      if (inst_copy_from_guest(inst, eip, inst_len) != inst_len) {
    1.29          printf("check_for_null_selector: get guest instruction failed\n");
    1.30 @@ -712,7 +712,7 @@ vmx_world_save(struct vcpu *d, struct vm
    1.31      unsigned long inst_len;
    1.32      int error = 0;
    1.33  
    1.34 -    error |= __vmread(INSTRUCTION_LEN, &inst_len);
    1.35 +    error |= __vmread(VM_EXIT_INSTRUCTION_LEN, &inst_len);
    1.36      error |= __vmread(GUEST_RIP, &c->eip);
    1.37      c->eip += inst_len; /* skip transition instruction */
    1.38      error |= __vmread(GUEST_RSP, &c->esp);

     2.1 --- a/xen/arch/x86/vmx_platform.c	Mon Aug 22 11:04:05 2005 -0700
     2.2 +++ b/xen/arch/x86/vmx_platform.c	Mon Aug 22 11:04:15 2005 -0700
     2.3 @@ -639,7 +639,7 @@ void handle_mmio(unsigned long va, unsig
     2.4      inst_decoder_regs = mpci_p->inst_decoder_regs;
     2.5  
     2.6      __vmread(GUEST_RIP, &eip);
     2.7 -    __vmread(INSTRUCTION_LEN, &inst_len);
     2.8 +    __vmread(VM_EXIT_INSTRUCTION_LEN, &inst_len);
     2.9      __vmread(GUEST_RFLAGS, &eflags);
    2.10      vm86 = eflags & X86_EFLAGS_VM;
    2.11  

     3.1 --- a/xen/include/asm-x86/vmx_vmcs.h	Mon Aug 22 11:04:05 2005 -0700
     3.2 +++ b/xen/include/asm-x86/vmx_vmcs.h	Mon Aug 22 11:04:15 2005 -0700
     3.3 @@ -183,7 +183,7 @@ enum vmcs_field {
     3.4      VM_ENTRY_MSR_LOAD_COUNT         = 0x00004014,
     3.5      VM_ENTRY_INTR_INFO_FIELD        = 0x00004016,
     3.6      VM_ENTRY_EXCEPTION_ERROR_CODE   = 0x00004018,
     3.7 -    VM_ENTRY_INSTRUCTION_LENGTH     = 0x0000401a,
     3.8 +    VM_ENTRY_INSTRUCTION_LEN        = 0x0000401a,
     3.9      TPR_THRESHOLD                   = 0x0000401c,
    3.10      SECONDARY_VM_EXEC_CONTROL       = 0x0000401e,
    3.11      VM_INSTRUCTION_ERROR            = 0x00004400,
    3.12 @@ -192,7 +192,7 @@ enum vmcs_field {
    3.13      VM_EXIT_INTR_ERROR_CODE         = 0x00004406,
    3.14      IDT_VECTORING_INFO_FIELD        = 0x00004408,
    3.15      IDT_VECTORING_ERROR_CODE        = 0x0000440a,
    3.16 -    INSTRUCTION_LEN                 = 0x0000440c,
    3.17 +    VM_EXIT_INSTRUCTION_LEN         = 0x0000440c,
    3.18      VMX_INSTRUCTION_INFO            = 0x0000440e,
    3.19      GUEST_ES_LIMIT                  = 0x00004800,
    3.20      GUEST_CS_LIMIT                  = 0x00004802,