Changeset 2761 in vbox for trunk/src

Timestamp:

May 22, 2007 12:01:46 PM (18 years ago)

Author:

vboxsync

Message:

Logging fixes

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (8 diffs)

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

@@ -434 +434 @@
         AssertRC(rc);
         Log2(("VMX_VMCS_HOST_CR0 %08x\n", ASMGetCR0()));
-        Log2(("VMX_VMCS_HOST_CR3 %08x\n", ASMGetCR3()));
+        Log2(("VMX_VMCS_HOST_CR3 %VHpx\n", ASMGetCR3()));
         Log2(("VMX_VMCS_HOST_CR4 %08x\n", ASMGetCR4()));
 
@@ -462 +462 @@
         rc |= VMXWriteVMCS(VMX_VMCS_HOST_IDTR_BASE, idtr.pIdt);
         AssertRC(rc);
-        Log2(("VMX_VMCS_HOST_GDTR_BASE %VGv\n", gdtr.pGdt));
-        Log2(("VMX_VMCS_HOST_IDTR_BASE %VGv\n", idtr.pIdt));
+        Log2(("VMX_VMCS_HOST_GDTR_BASE %VHv\n", gdtr.pGdt));
+        Log2(("VMX_VMCS_HOST_IDTR_BASE %VHv\n", idtr.pIdt));
 
         /* Save the base address of the TR selector. */
@@ -476 +476 @@
         rc = VMXWriteVMCS(VMX_VMCS_HOST_TR_BASE, trBase);
         AssertRC(rc);
-        Log2(("VMX_VMCS_HOST_TR_BASE %VGv\n", trBase));
+        Log2(("VMX_VMCS_HOST_TR_BASE %VHv\n", trBase));
 
         /* FS and GS base. */
@@ -483 +483 @@
         rc |= VMXWriteVMCS(VMX_VMCS_HOST_GS_BASE,           0);
 #else
+        Log2(("MSR_K8_FS_BASE = %VHv\n", ASMRdMsr(MSR_K8_FS_BASE)));
+        Log2(("MSR_K8_GS_BASE = %VHv\n", ASMRdMsr(MSR_K8_GS_BASE)));
         rc  = VMXWriteVMCS64(VMX_VMCS_HOST_FS_BASE,         ASMRdMsr(MSR_K8_FS_BASE));
         rc |= VMXWriteVMCS64(VMX_VMCS_HOST_GS_BASE,         ASMRdMsr(MSR_K8_GS_BASE));
@@ -491 +493 @@
         /** @todo expensive!! */
         rc  = VMXWriteVMCS(VMX_VMCS_HOST_SYSENTER_CS,       ASMRdMsr_Low(MSR_IA32_SYSENTER_CS));
+        Log2(("VMX_VMCS_HOST_SYSENTER_CS  %08x\n", ASMRdMsr_Low(MSR_IA32_SYSENTER_CS)));
 #if HC_ARCH_BITS == 32
         rc |= VMXWriteVMCS(VMX_VMCS_HOST_SYSENTER_ESP,      ASMRdMsr_Low(MSR_IA32_SYSENTER_ESP));
         rc |= VMXWriteVMCS(VMX_VMCS_HOST_SYSENTER_EIP,      ASMRdMsr_Low(MSR_IA32_SYSENTER_EIP));
-        Log2(("VMX_VMCS_HOST_SYSENTER_CS  %08x\n", ASMRdMsr_Low(MSR_IA32_SYSENTER_CS)));
-        Log2(("VMX_VMCS_HOST_SYSENTER_EIP %VGv\n", ASMRdMsr_Low(MSR_IA32_SYSENTER_EIP)));
-        Log2(("VMX_VMCS_HOST_SYSENTER_ESP %VGv\n", ASMRdMsr_Low(MSR_IA32_SYSENTER_ESP)));
+        Log2(("VMX_VMCS_HOST_SYSENTER_EIP %VHv\n", ASMRdMsr_Low(MSR_IA32_SYSENTER_EIP)));
+        Log2(("VMX_VMCS_HOST_SYSENTER_ESP %VHv\n", ASMRdMsr_Low(MSR_IA32_SYSENTER_ESP)));
 #else
+        Log2(("VMX_VMCS_HOST_SYSENTER_EIP %VHv\n", ASMRdMsr(MSR_IA32_SYSENTER_EIP)));
+        Log2(("VMX_VMCS_HOST_SYSENTER_ESP %VHv\n", ASMRdMsr(MSR_IA32_SYSENTER_ESP)));
         rc |= VMXWriteVMCS64(VMX_VMCS_HOST_SYSENTER_ESP,      ASMRdMsr(MSR_IA32_SYSENTER_ESP));
         rc |= VMXWriteVMCS64(VMX_VMCS_HOST_SYSENTER_EIP,      ASMRdMsr(MSR_IA32_SYSENTER_EIP));
@@ -1000 +1004 @@
 
             ASMGetGDTR(&gdtr);
-            VMXWriteVMCS(VMX_VMCS_HOST_GDTR_BASE, gdtr.pGdt);
 
             Log(("Unable to start/resume VM for reason: %x. Instruction error %x\n", (uint32_t)exitReason, (uint32_t)instrError));
@@ -1071 +1074 @@
 
             VMXReadVMCS(VMX_VMCS_HOST_TR_BASE, &val);
-            Log(("VMX_VMCS_HOST_TR_BASE %VGv\n", val));
+            Log(("VMX_VMCS_HOST_TR_BASE %VHv\n", val));
 
             VMXReadVMCS(VMX_VMCS_HOST_GDTR_BASE, &val);
-            Log(("VMX_VMCS_HOST_GDTR_BASE %VGv\n", val));
+            Log(("VMX_VMCS_HOST_GDTR_BASE %VHv\n", val));
             VMXReadVMCS(VMX_VMCS_HOST_IDTR_BASE, &val);
-            Log(("VMX_VMCS_HOST_IDTR_BASE %VGv\n", val));
+            Log(("VMX_VMCS_HOST_IDTR_BASE %VHv\n", val));
 
             VMXReadVMCS(VMX_VMCS_HOST_SYSENTER_CS, &val);
@@ -1082 +1085 @@
 
             VMXReadVMCS(VMX_VMCS_HOST_SYSENTER_EIP, &val);
-            Log(("VMX_VMCS_HOST_SYSENTER_EIP %VGv\n", val));
+            Log(("VMX_VMCS_HOST_SYSENTER_EIP %VHv\n", val));
 
             VMXReadVMCS(VMX_VMCS_HOST_SYSENTER_ESP, &val);
-            Log(("VMX_VMCS_HOST_SYSENTER_ESP %VGv\n", val));
+            Log(("VMX_VMCS_HOST_SYSENTER_ESP %VHv\n", val));
 
             VMXReadVMCS(VMX_VMCS_HOST_RSP, &val);
-            Log(("VMX_VMCS_HOST_RSP %VGv\n", val));
+            Log(("VMX_VMCS_HOST_RSP %VHv\n", val));
             VMXReadVMCS(VMX_VMCS_HOST_RIP, &val);
-            Log(("VMX_VMCS_HOST_RIP %VGv\n", val));
+            Log(("VMX_VMCS_HOST_RIP %VHv\n", val));
         }
 #endif /* VBOX_STRICT */