Index: /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 45454)
+++ /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 45455)
@@ -441,5 +441,5 @@
  *
  * @returns VBox status code.
- * @param   pVCpu           Pointer to the VMCPU. 
+ * @param   pVCpu           Pointer to the VMCPU.
  * @param   pVmxTransient   Pointer to the VMX transient structure.
  *
@@ -459,5 +459,5 @@
  *
  * @returns VBox status code.
- * @param   pVCpu           Pointer to the VMCPU. 
+ * @param   pVCpu           Pointer to the VMCPU.
  * @param   pVmxTransient   Pointer to the VMX transient structure.
  */
@@ -479,5 +479,5 @@
  *
  * @returns VBox status code.
- * @param   pVCpu           Pointer to the VMCPU. 
+ * @param   pVCpu           Pointer to the VMCPU.
  * @param   pVmxTransient   Pointer to the VMX transient structure.
  */
@@ -498,6 +498,6 @@
  * transient structure.
  *
- * @returns VBox status code. 
- * @param   pVCpu           Pointer to the VMCPU. 
+ * @returns VBox status code.
+ * @param   pVCpu           Pointer to the VMCPU.
  * @param   pVmxTransient   Pointer to the VMX transient structure.
  */
@@ -517,6 +517,6 @@
  * Reads the exit qualification from the VMCS into the VMX transient structure.
  *
- * @returns VBox status code. 
- * @param   pVCpu           Pointer to the VMCPU. 
+ * @returns VBox status code.
+ * @param   pVCpu           Pointer to the VMCPU.
  * @param   pVmxTransient   Pointer to the VMX transient structure.
  */
@@ -558,5 +558,5 @@
  * transient structure.
  *
- * @returns VBox status code. 
+ * @returns VBox status code.
  * @param   pVmxTransient   Pointer to the VMX transient structure.
  */
@@ -2324,9 +2324,9 @@
  * @returns VBox status code.
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       Pointer to the VMCPU. 
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   pMixedCtx   Pointer to the guest-CPU context. The data may be
  *                      out-of-sync. Make sure to update the required fields
  *                      before using them.
- *  
+ *
  * @remarks requires EFER.
  */
@@ -4431,8 +4431,8 @@
 /**
  * Loads the VMCS write-cache into the CPU (by executing VMWRITEs).
- *  
- * @param   pVCpu           Pointer to the VMCPU. 
+ *
+ * @param   pVCpu           Pointer to the VMCPU.
  * @param   pCache          Pointer to the VMCS cache.
- *  
+ *
  * @remarks No-long-jump zone!!!
  */
@@ -4452,7 +4452,7 @@
  * Stores the VMCS read-cache from the CPU (by executing VMREADs).
  *
- * @param   pVCpu           Pointer to the VMCPU. 
+ * @param   pVCpu           Pointer to the VMCPU.
  * @param   pCache          Pointer to the VMCS cache.
- *  
+ *
  * @remarks No-long-jump zone!!!
  */
@@ -5161,6 +5161,6 @@
  * context.
  *
- * @returns VBox status code. 
- * @param   pVCpu       Pointer to the VMCPU. 
+ * @returns VBox status code.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   idxSel      Index of the selector in the VMCS.
  * @param   idxLimit    Index of the segment limit in the VMCS.
@@ -5169,5 +5169,5 @@
  * @param   pSelReg     Pointer to the segment selector.
  *
- * @remarks No-long-jump zone!!! 
+ * @remarks No-long-jump zone!!!
  * @remarks Never call this function directly. Use the VMXLOCAL_READ_SEG() macro
  *          as that takes care of whether to read from the VMCS cache or not.
@@ -5224,9 +5224,9 @@
 #define VMXLOCAL_READ_SEG(Sel, CtxSel) \
     hmR0VmxReadSegmentReg(pVCpu, VMX_VMCS16_GUEST_FIELD_##Sel, VMX_VMCS32_GUEST_##Sel##_LIMIT,                  \
-                          VMX_VMCS_GUEST_##Sel##_BASE_CACHE_IDX, VMX_VMCS32_GUEST_##Sel##_ACCESS_RIGHTS, &pMixedCtx->##CtxSel)
+                          VMX_VMCS_GUEST_##Sel##_BASE_CACHE_IDX, VMX_VMCS32_GUEST_##Sel##_ACCESS_RIGHTS, &pMixedCtx->CtxSel)
 #else
-#define VMXLOCAL_READ_SEG(Sel, Val) \
+#define VMXLOCAL_READ_SEG(Sel, CtxSel) \
     hmR0VmxReadSegmentReg(pVCpu, VMX_VMCS16_GUEST_FIELD_##Sel, VMX_VMCS32_GUEST_##Sel##_LIMIT,                  \
-                          VMX_VMCS_GUEST_##Sel##_BASE, VMX_VMCS32_GUEST_##Sel##_ACCESS_RIGHTS, &pMixedCtx->##CtxSel)
+                          VMX_VMCS_GUEST_##Sel##_BASE, VMX_VMCS32_GUEST_##Sel##_ACCESS_RIGHTS, &pMixedCtx->CtxSel)
 #endif