1.1 --- a/xen/arch/x86/hvm/vmx/intr.c	Fri Jul 06 14:34:54 2007 +0100
     1.2 +++ b/xen/arch/x86/hvm/vmx/intr.c	Fri Jul 06 14:36:34 2007 +0100
     1.3 @@ -73,7 +73,7 @@
     1.4  
     1.5  static void enable_intr_window(struct vcpu *v, enum hvm_intack intr_source)
     1.6  {
     1.7 -    u32 *cpu_exec_control = &v->arch.hvm_vcpu.u.vmx.exec_control;
     1.8 +    u32 *cpu_exec_control = &v->arch.hvm_vmx.exec_control;
     1.9      u32 ctl = CPU_BASED_VIRTUAL_INTR_PENDING;
    1.10  
    1.11      if ( unlikely(intr_source == hvm_intack_none) )

     2.1 --- a/xen/arch/x86/hvm/vmx/vmcs.c	Fri Jul 06 14:34:54 2007 +0100
     2.2 +++ b/xen/arch/x86/hvm/vmx/vmcs.c	Fri Jul 06 14:36:34 2007 +0100
     2.3 @@ -318,7 +318,7 @@ static void construct_vmcs(struct vcpu *
     2.4      __vmwrite(VM_EXIT_CONTROLS, vmx_vmexit_control);
     2.5      __vmwrite(VM_ENTRY_CONTROLS, vmx_vmentry_control);
     2.6      __vmwrite(CPU_BASED_VM_EXEC_CONTROL, vmx_cpu_based_exec_control);
     2.7 -    v->arch.hvm_vcpu.u.vmx.exec_control = vmx_cpu_based_exec_control;
     2.8 +    v->arch.hvm_vmx.exec_control = vmx_cpu_based_exec_control;
     2.9      if ( vmx_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS )
    2.10          __vmwrite(SECONDARY_VM_EXEC_CONTROL, vmx_secondary_exec_control);
    2.11  

     3.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Fri Jul 06 14:34:54 2007 +0100
     3.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Fri Jul 06 14:36:34 2007 +0100
     3.3 @@ -433,8 +433,8 @@ static inline void vmx_save_dr(struct vc
     3.4  
     3.5      /* Clear the DR dirty flag and re-enable intercepts for DR accesses. */
     3.6      v->arch.hvm_vcpu.flag_dr_dirty = 0;
     3.7 -    v->arch.hvm_vcpu.u.vmx.exec_control |= CPU_BASED_MOV_DR_EXITING;
     3.8 -    __vmwrite(CPU_BASED_VM_EXEC_CONTROL, v->arch.hvm_vcpu.u.vmx.exec_control);
     3.9 +    v->arch.hvm_vmx.exec_control |= CPU_BASED_MOV_DR_EXITING;
    3.10 +    __vmwrite(CPU_BASED_VM_EXEC_CONTROL, v->arch.hvm_vmx.exec_control);
    3.11  
    3.12      savedebug(&v->arch.guest_context, 0);
    3.13      savedebug(&v->arch.guest_context, 1);
    3.14 @@ -1440,9 +1440,9 @@ static void vmx_dr_access(unsigned long 
    3.15      __restore_debug_registers(v);
    3.16  
    3.17      /* Allow guest direct access to DR registers */
    3.18 -    v->arch.hvm_vcpu.u.vmx.exec_control &= ~CPU_BASED_MOV_DR_EXITING;
    3.19 +    v->arch.hvm_vmx.exec_control &= ~CPU_BASED_MOV_DR_EXITING;
    3.20      __vmwrite(CPU_BASED_VM_EXEC_CONTROL,
    3.21 -              v->arch.hvm_vcpu.u.vmx.exec_control);
    3.22 +              v->arch.hvm_vmx.exec_control);
    3.23  }
    3.24  
    3.25  /*
    3.26 @@ -2984,15 +2984,15 @@ asmlinkage void vmx_vmexit_handler(struc
    3.27          break;
    3.28      case EXIT_REASON_PENDING_VIRT_INTR:
    3.29          /* Disable the interrupt window. */
    3.30 -        v->arch.hvm_vcpu.u.vmx.exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING;
    3.31 +        v->arch.hvm_vmx.exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING;
    3.32          __vmwrite(CPU_BASED_VM_EXEC_CONTROL,
    3.33 -                  v->arch.hvm_vcpu.u.vmx.exec_control);
    3.34 +                  v->arch.hvm_vmx.exec_control);
    3.35          break;
    3.36      case EXIT_REASON_PENDING_VIRT_NMI:
    3.37          /* Disable the NMI window. */
    3.38 -        v->arch.hvm_vcpu.u.vmx.exec_control &= ~CPU_BASED_VIRTUAL_NMI_PENDING;
    3.39 +        v->arch.hvm_vmx.exec_control &= ~CPU_BASED_VIRTUAL_NMI_PENDING;
    3.40          __vmwrite(CPU_BASED_VM_EXEC_CONTROL,
    3.41 -                  v->arch.hvm_vcpu.u.vmx.exec_control);
    3.42 +                  v->arch.hvm_vmx.exec_control);
    3.43          break;
    3.44      case EXIT_REASON_TASK_SWITCH:
    3.45          goto exit_and_crash;