Changeset 98644 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 20, 2023 12:05:56 PM (2 years ago)

Author:

vboxsync

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

155944

Message:

VMM,SUPLib: Adjustments for running tstPDMQueue in driverless mode on hardened windows builds. This adds a fFlags parameter to VMR3Create and defines VMCREATE_F_DRIVERLESS, allowing it to switch between default and driverless suplib initialization. The default CFGM config constructor was amended to enable the IEM fallback option by default (only relevant to amd64/x86).

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CFGM.cpp (modified) (2 diffs)
• VM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/CFGM.cpp

@@ -1085 +1085 @@
     rc = CFGMR3InsertInteger(pRoot, "TimerMillies",         10);
     UPDATERC();
+
+    /*
+     * HM.
+     */
+    PCFGMNODE pHm;
+    rc = CFGMR3InsertNode(pRoot, "HM", &pHm);
+    UPDATERC();
+    rc = CFGMR3InsertInteger(pHm, "FallbackToIEM",          1); /* boolean */
+    UPDATERC();
+
 
     /*
@@ -3293 +3303 @@
     LogRel(("************************* CFGM dump *************************\n"));
     cfgmR3Dump(pRoot, 0, DBGFR3InfoLogRelHlp());
+#ifdef LOG_ENABLED
+    if (LogIsEnabled())
+        cfgmR3Dump(pRoot, 0, DBGFR3InfoLogHlp());
+#endif
     LogRel(("********************* End of CFGM dump **********************\n"));
     RTLogRelSetBuffering(fOldBuffered);

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -133 +133 @@
  *                              to make the user perform various action, like
  *                              for instance state saving.
+ * @param   fFlags              VMCREATE_F_XXX
  * @param   pfnVMAtError        Pointer to callback function for setting VM
  *                              errors.  This was added as an implicit call to
@@ -151 +152 @@
  *                              VMR3ReleaseUVM() once done with the handle.
  */
-VMMR3DECL(int)   VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods,
+VMMR3DECL(int)   VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods, uint64_t fFlags,
                             PFNVMATERROR pfnVMAtError, void *pvUserVM,
                             PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUserCFGM,
                             PVM *ppVM, PUVM *ppUVM)
 {
-    LogFlow(("VMR3Create: cCpus=%RU32 pVmm2UserMethods=%p pfnVMAtError=%p pvUserVM=%p  pfnCFGMConstructor=%p pvUserCFGM=%p ppVM=%p ppUVM=%p\n",
-             cCpus, pVmm2UserMethods, pfnVMAtError, pvUserVM, pfnCFGMConstructor, pvUserCFGM, ppVM, ppUVM));
+    LogFlow(("VMR3Create: cCpus=%RU32 pVmm2UserMethods=%p fFlags=%#RX64 pfnVMAtError=%p pvUserVM=%p  pfnCFGMConstructor=%p pvUserCFGM=%p ppVM=%p ppUVM=%p\n",
+             cCpus, pVmm2UserMethods, fFlags, pfnVMAtError, pvUserVM, pfnCFGMConstructor, pvUserCFGM, ppVM, ppUVM));
 
     if (pVmm2UserMethods)
@@ -177 +178 @@
     AssertPtrNullReturn(ppUVM, VERR_INVALID_POINTER);
     AssertReturn(ppVM || ppUVM, VERR_INVALID_PARAMETER);
+    AssertMsgReturn(!(fFlags & ~VMCREATE_F_DRIVERLESS), ("%#RX64\n", fFlags), VERR_INVALID_FLAGS);
 
     /*
@@ -198 +200 @@
          * Initialize the support library creating the session for this VM.
          */
-        rc = SUPR3Init(&pUVM->vm.s.pSession);
+        if (fFlags & VMCREATE_F_DRIVERLESS)
+            rc = SUPR3InitEx(SUPR3INIT_F_DRIVERLESS | SUPR3INIT_F_DRIVERLESS_IEM_ALLOWED, &pUVM->vm.s.pSession);
+        else
+            rc = SUPR3Init(&pUVM->vm.s.pSession);
         if (RT_SUCCESS(rc))
         {