Changeset 18008 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Mar 17, 2009 10:13:11 AM (16 years ago)

Author:

vboxsync

Message:

Some extra checks

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (3 diffs)

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

@@ -465 +465 @@
         int aRc[RTCPUSET_MAX_CPUS];
 
-        rc = RTPowerNotificationDeregister(hwaccmR0PowerCallback, 0);
-        Assert(RT_SUCCESS(rc));
+        Assert(!HWACCMR0Globals.vmx.fUsingSUPR0EnableVTx);
+        if (!HWACCMR0Globals.vmx.fUsingSUPR0EnableVTx)
+        {
+            rc = RTPowerNotificationDeregister(hwaccmR0PowerCallback, 0);
+            Assert(RT_SUCCESS(rc));
+        }
 
         memset(aRc, 0, sizeof(aRc));
@@ -511 +515 @@
 
         /*
-        * Both the LOCK and VMXON bit must be set; otherwise VMXON will generate a #GP.
-        * Once the lock bit is set, this MSR can no longer be modified.
-        */
+         * Both the LOCK and VMXON bit must be set; otherwise VMXON will generate a #GP.
+         * Once the lock bit is set, this MSR can no longer be modified.
+         */
         if (    !(val & (MSR_IA32_FEATURE_CONTROL_VMXON|MSR_IA32_FEATURE_CONTROL_LOCK))
             ||  ((val & (MSR_IA32_FEATURE_CONTROL_VMXON|MSR_IA32_FEATURE_CONTROL_LOCK)) == MSR_IA32_FEATURE_CONTROL_VMXON) /* Some BIOSes forget to set the locked bit. */
@@ -705 +709 @@
     Assert(idCpu < RT_ELEMENTS(HWACCMR0Globals.aCpuInfo));
     Assert(ASMAtomicReadBool(&pCpu->fInUse) == false);
+    Assert(!pCpu->fConfigured || pCpu->pMemObj);
 
     if (!pCpu->pMemObj)