Changeset 45455 in vbox for trunk

Timestamp:

Apr 10, 2013 12:24:35 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0/HM: build fix.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (12 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -441 +441 @@
  *
  * @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 +459 @@
  *
  * @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 +479 @@
  *
  * @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 +498 @@
  * 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 +517 @@
  * 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 +558 @@
  * transient structure.
  *
- * @returns VBox status code. 
+ * @returns VBox status code.
  * @param   pVmxTransient   Pointer to the VMX transient structure.
  */
@@ -2324 +2324 @@
  * @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 +4431 @@
 /**
  * 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 +4452 @@
  * 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 +5161 @@
  * 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 +5169 @@
  * @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 +5224 @@
 #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