Changeset 19232 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 28, 2009 10:04:38 AM (16 years ago)

Author:

vboxsync

Message:

Assertions for raw mode & SMP guests.

Location:

trunk/src/VBox/VMM

Files:

• VMM.cpp (modified) (3 diffs)
• VMMAll/PGMAllMap.cpp (modified) (1 diff)
• VMMR0/VMMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMM.cpp

@@ -1079 +1079 @@
     Log2(("VMMR3RawRunGC: (cs:eip=%04x:%08x)\n", CPUMGetGuestCS(pVCpu), CPUMGetGuestEIP(pVCpu)));
 
+    AssertReturn(pVM->cCPUs == 1, VERR_RAW_MODE_INVALID_SMP);
+
     /*
      * Set the EIP and ESP.
@@ -1210 +1212 @@
 {
     /* Raw mode implies 1 VCPU. */
-    Assert(pVM->cCPUs == 1);
+    AssertReturn(pVM->cCPUs == 1, VERR_RAW_MODE_INVALID_SMP);
     PVMCPU pVCpu = &pVM->aCpus[0];
 
@@ -1329 +1331 @@
 {
     Log(("VMMR3ResumeHyper: eip=%RRv esp=%RRv\n", CPUMGetHyperEIP(pVCpu), CPUMGetHyperESP(pVCpu)));
+    AssertReturn(pVM->cCPUs == 1, VERR_RAW_MODE_INVALID_SMP);
 
     /*

trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp

@@ -634 +634 @@
     Log4(("pgmMapActivateCR3: fixed mappings=%d idxShwPageCR3=%#x\n", pVM->pgm.s.fMappingsFixed, pShwPageCR3 ? pShwPageCR3->idx : NIL_PGMPOOL_IDX));
 
-    Assert(pVM->cCPUs == 1);
-
-#ifdef DEBUG
+#ifdef VBOX_STRICT
     /* This only applies to raw mode where we only support 1 VCPU. */
     PVMCPU pVCpu = &pVM->aCpus[0];
-#endif
     Assert(pShwPageCR3 && pShwPageCR3 == pVCpu->pgm.s.CTX_SUFF(pShwPageCR3));
+#endif
 
     /*

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

@@ -552 +552 @@
                 bool fVTxDisabled;
 
+                if (RT_UNLIKELY(pVM->cCPUs > 1))
+                {
+                    pVM->vmm.s.iLastGZRc = VERR_RAW_MODE_INVALID_SMP;
+                    return;
+                }
+
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
                 if (RT_UNLIKELY(!PGMGetHyperCR3(pVCpu)))