Changeset 3292 in vbox

Timestamp:

Jun 26, 2007 2:15:29 PM (18 years ago)

Author:

vboxsync

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

22395

Message:

Write the exact reason for VMX/SVM detection failure to the release log.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (2 diffs)
• HWACCMInternal.h (modified) (2 diffs)
• VMMR0/HWACCMR0.cpp (modified) (3 diffs)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -442 +442 @@
             {
                 LogRel(("HWACCM: VMX setup failed with rc=%Vrc!\n", rc));
+                LogRel(("HWACCM: Last instruction error %x\n", pVM->hwaccm.s.vmx.ulLastInstrError));
                 pVM->fHWACCMEnabled = false;
             }
@@ -476 +477 @@
             }
         }
+    }
+    else
+    {
+        LogRel(("HWACCM: No VMX or SVM CPU extension found. Reason %Vrc\n", pVM->hwaccm.s.ulLastError));
     }
 

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -192 +192 @@
             uint64_t                vmx_vmcs_enum;
         } msr;
+
+        /* Last instruction error */
+        uint32_t                    ulLastInstrError;
     } vmx;
 
@@ -250 +253 @@
         uint64_t                    intInfo;
     } Event;
+
+    /** Saved error from detection */
+    uint32_t                ulLastError;
 
     /** Currenty shadow paging mode. */

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

@@ -60 +60 @@
 
 #ifndef VBOX_WITH_HYBIRD_32BIT_KERNEL /* paranoia */
+
+    pVM->hwaccm.s.ulLastError = VINF_SUCCESS;
 
     /*
@@ -123 +125 @@
                     }
                 }
+                else
+                    pVM->hwaccm.s.ulLastError = VERR_VMX_ILLEGAL_FEATURE_CONTROL_MSR;
             }
+            else
+                pVM->hwaccm.s.ulLastError = VERR_VMX_NO_VMX;
         }
         else
@@ -158 +164 @@
                 }
                 else
+                {
+                    pVM->hwaccm.s.ulLastError = VERR_SVM_ILLEGAL_EFER_MSR;
                     AssertFailed();
+                }
             }
+            else
+                pVM->hwaccm.s.ulLastError = VERR_SVM_NO_SVM;
         }
-    }
+        else
+            pVM->hwaccm.s.ulLastError = VERR_HWACCM_UNKNOWN_CPU;
+    }
+    else
+        pVM->hwaccm.s.ulLastError = VERR_HWACCM_NO_CPUID;
+
 #endif /* !VBOX_WITH_HYBIRD_32BIT_KERNEL */
 

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

@@ -46 +46 @@
 
 
+static void VMXR0CheckError(PVM pVM, int rc)
+{
+    if (rc == VERR_VMX_GENERIC)
+    {
+        RTCCUINTREG instrError;
+
+        VMXReadVMCS(VMX_VMCS_RO_VM_INSTR_ERROR, &instrError);
+        Log(("VMXR0CheckError -> generic error %x\n", instrError));
+
+        pVM->hwaccm.s.vmx.ulLastInstrError = instrError;
+    }
+    else
+    {
+        Log(("VMXR0CheckError failed with %Vrc\n", rc));
+    }
+    pVM->hwaccm.s.ulLastError = rc;
+}
+
 /**
  * Sets up and activates VMX
@@ -79 +97 @@
     if (VBOX_FAILURE(rc))
     {
-#ifdef DEBUG
-        if (rc == VERR_VMX_GENERIC)
-        {
-            RTCCUINTREG instrError;
-
-            VMXReadVMCS(VMX_VMCS_RO_VM_INSTR_ERROR, &instrError);
-            Log(("VMXEnable -> generic error %x\n", instrError));
-        }
-        else
-            Log(("VMXEnable failed with %Vrc\n", rc));
-#endif
+        VMXR0CheckError(pVM, rc);
         return rc;
     }
@@ -269 +277 @@
 
 vmx_end:
+    VMXR0CheckError(pVM, rc);
     /* Leave VMX Root Mode. */
     VMXDisable();