[Xen-changelog] [xen-unstable] Use short name format when reference to vcpu vmx union member.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1183728994 -3600
# Node ID 300d1effb792700ad231a9627443be4158b832a8
# Parent  d6078c9423555d7ada248594114ff041893bade6
Use short name format when reference to vcpu vmx union member.
Signed-off-by: Xin Li <xin.b.li@xxxxxxxxx>
---
 xen/arch/x86/hvm/vmx/intr.c |    2 +-
 xen/arch/x86/hvm/vmx/vmcs.c |    2 +-
 xen/arch/x86/hvm/vmx/vmx.c  |   16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff -r d6078c942355 -r 300d1effb792 xen/arch/x86/hvm/vmx/intr.c
--- a/xen/arch/x86/hvm/vmx/intr.c       Fri Jul 06 14:34:54 2007 +0100
+++ b/xen/arch/x86/hvm/vmx/intr.c       Fri Jul 06 14:36:34 2007 +0100
@@ -73,7 +73,7 @@
 
 static void enable_intr_window(struct vcpu *v, enum hvm_intack intr_source)
 {
-    u32 *cpu_exec_control = &v->arch.hvm_vcpu.u.vmx.exec_control;
+    u32 *cpu_exec_control = &v->arch.hvm_vmx.exec_control;
     u32 ctl = CPU_BASED_VIRTUAL_INTR_PENDING;
 
     if ( unlikely(intr_source == hvm_intack_none) )
diff -r d6078c942355 -r 300d1effb792 xen/arch/x86/hvm/vmx/vmcs.c
--- a/xen/arch/x86/hvm/vmx/vmcs.c       Fri Jul 06 14:34:54 2007 +0100
+++ b/xen/arch/x86/hvm/vmx/vmcs.c       Fri Jul 06 14:36:34 2007 +0100
@@ -318,7 +318,7 @@ static void construct_vmcs(struct vcpu *
     __vmwrite(VM_EXIT_CONTROLS, vmx_vmexit_control);
     __vmwrite(VM_ENTRY_CONTROLS, vmx_vmentry_control);
     __vmwrite(CPU_BASED_VM_EXEC_CONTROL, vmx_cpu_based_exec_control);
-    v->arch.hvm_vcpu.u.vmx.exec_control = vmx_cpu_based_exec_control;
+    v->arch.hvm_vmx.exec_control = vmx_cpu_based_exec_control;
     if ( vmx_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS )
         __vmwrite(SECONDARY_VM_EXEC_CONTROL, vmx_secondary_exec_control);
 
diff -r d6078c942355 -r 300d1effb792 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Fri Jul 06 14:34:54 2007 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Fri Jul 06 14:36:34 2007 +0100
@@ -433,8 +433,8 @@ static inline void vmx_save_dr(struct vc
 
     /* Clear the DR dirty flag and re-enable intercepts for DR accesses. */
     v->arch.hvm_vcpu.flag_dr_dirty = 0;
-    v->arch.hvm_vcpu.u.vmx.exec_control |= CPU_BASED_MOV_DR_EXITING;
-    __vmwrite(CPU_BASED_VM_EXEC_CONTROL, v->arch.hvm_vcpu.u.vmx.exec_control);
+    v->arch.hvm_vmx.exec_control |= CPU_BASED_MOV_DR_EXITING;
+    __vmwrite(CPU_BASED_VM_EXEC_CONTROL, v->arch.hvm_vmx.exec_control);
 
     savedebug(&v->arch.guest_context, 0);
     savedebug(&v->arch.guest_context, 1);
@@ -1440,9 +1440,9 @@ static void vmx_dr_access(unsigned long 
     __restore_debug_registers(v);
 
     /* Allow guest direct access to DR registers */
-    v->arch.hvm_vcpu.u.vmx.exec_control &= ~CPU_BASED_MOV_DR_EXITING;
+    v->arch.hvm_vmx.exec_control &= ~CPU_BASED_MOV_DR_EXITING;
     __vmwrite(CPU_BASED_VM_EXEC_CONTROL,
-              v->arch.hvm_vcpu.u.vmx.exec_control);
+              v->arch.hvm_vmx.exec_control);
 }
 
 /*
@@ -2984,15 +2984,15 @@ asmlinkage void vmx_vmexit_handler(struc
         break;
     case EXIT_REASON_PENDING_VIRT_INTR:
         /* Disable the interrupt window. */
-        v->arch.hvm_vcpu.u.vmx.exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING;
+        v->arch.hvm_vmx.exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING;
         __vmwrite(CPU_BASED_VM_EXEC_CONTROL,
-                  v->arch.hvm_vcpu.u.vmx.exec_control);
+                  v->arch.hvm_vmx.exec_control);
         break;
     case EXIT_REASON_PENDING_VIRT_NMI:
         /* Disable the NMI window. */
-        v->arch.hvm_vcpu.u.vmx.exec_control &= ~CPU_BASED_VIRTUAL_NMI_PENDING;
+        v->arch.hvm_vmx.exec_control &= ~CPU_BASED_VIRTUAL_NMI_PENDING;
         __vmwrite(CPU_BASED_VM_EXEC_CONTROL,
-                  v->arch.hvm_vcpu.u.vmx.exec_control);
+                  v->arch.hvm_vmx.exec_control);
         break;
     case EXIT_REASON_TASK_SWITCH:
         goto exit_and_crash;

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