Changeset 26025 in vbox

Timestamp:

Jan 25, 2010 4:42:29 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56918

Message:

build fix.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWVMXR0.cpp (modified) (2 diffs)
• HWVMXR0.h (modified) (1 diff)

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

@@ -2917 +2917 @@
                             break;
                         }
-                    }                   
+                    }
                     goto ResumeExecution;
                 }
@@ -4072 +4072 @@
         Log(("VMX_VMCS_GUEST_RFLAGS     %08x\n", val2));
 
-        VMX_LOG_SELREG(CS, "CS");
-        VMX_LOG_SELREG(DS, "DS");
-        VMX_LOG_SELREG(ES, "ES");
-        VMX_LOG_SELREG(FS, "FS");
-        VMX_LOG_SELREG(GS, "GS");
-        VMX_LOG_SELREG(SS, "SS");
-        VMX_LOG_SELREG(TR, "TR");
-        VMX_LOG_SELREG(LDTR, "LDTR");
+        VMX_LOG_SELREG(CS, "CS", val2);
+        VMX_LOG_SELREG(DS, "DS", val2);
+        VMX_LOG_SELREG(ES, "ES", val2);
+        VMX_LOG_SELREG(FS, "FS", val2);
+        VMX_LOG_SELREG(GS, "GS", val2);
+        VMX_LOG_SELREG(SS, "SS", val2);
+        VMX_LOG_SELREG(TR, "TR", val2);
+        VMX_LOG_SELREG(LDTR, "LDTR", val2);
 
         VMXReadVMCS(VMX_VMCS64_GUEST_GDTR_BASE, &val2);

trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

@@ -257 +257 @@
 
 /* Don't read from the cache in this macro; used only in case of failure where the cache is out of sync. */
-# define VMX_LOG_SELREG(REG, szSelReg) \
-{                                                                    \
-        VMXReadVMCS(VMX_VMCS16_GUEST_FIELD_##REG,           &val);   \
-        Log(("%s Selector     %x\n", szSelReg, val));                \
-        VMXReadVMCS(VMX_VMCS32_GUEST_##REG##_LIMIT,         &val);   \
-        Log(("%s Limit        %x\n", szSelReg, val));                \
-        VMXReadVMCS(VMX_VMCS64_GUEST_##REG##_BASE,          &val);   \
-        Log(("%s Base         %RX64\n", szSelReg, (uint64_t)val));   \
-        VMXReadVMCS(VMX_VMCS32_GUEST_##REG##_ACCESS_RIGHTS, &val);   \
-        Log(("%s Attributes   %x\n", szSelReg, val));                \
+# define VMX_LOG_SELREG(REG, szSelReg, val) \
+{                                                                      \
+        VMXReadVMCS(VMX_VMCS16_GUEST_FIELD_##REG,           &(val));   \
+        Log(("%s Selector     %x\n", szSelReg, (val)));                \
+        VMXReadVMCS(VMX_VMCS32_GUEST_##REG##_LIMIT,         &(val));   \
+        Log(("%s Limit        %x\n", szSelReg, (val)));                \
+        VMXReadVMCS(VMX_VMCS64_GUEST_##REG##_BASE,          &(val));   \
+        Log(("%s Base         %RX64\n", szSelReg, (uint64_t)(val)));   \
+        VMXReadVMCS(VMX_VMCS32_GUEST_##REG##_ACCESS_RIGHTS, &(val));   \
+        Log(("%s Attributes   %x\n", szSelReg, (val)));                \
 }