Changeset 80282 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

Aug 15, 2019 7:36:15 AM (5 years ago)

Author:

vboxsync

Message:

tstSSM: Does not need to be hardnend. bugref:9217

Location:

trunk/src/VBox/VMM/testcase

Files:

• Makefile.kmk (modified) (2 diffs)
• tstSSM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -61 +61 @@
  ifdef VBOX_WITH_TESTCASES
   if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
-PROGRAMS += tstCFGMHardened tstSSMHardened tstVMREQHardened tstMMHyperHeapHardened tstAnimateHardened
-DLLS     += tstCFGM tstSSM tstVMREQ tstMMHyperHeap tstAnimate
+PROGRAMS += tstCFGMHardened tstVMREQHardened tstMMHyperHeapHardened tstAnimateHardened
+DLLS     += tstCFGM tstVMREQ tstMMHyperHeap tstAnimate
   else
-PROGRAMS += tstCFGM tstSSM tstVMREQ tstMMHyperHeap tstAnimate
+PROGRAMS += tstCFGM tstVMREQ tstMMHyperHeap tstAnimate
   endif
 PROGRAMS += \
         tstCompressionBenchmark \
         tstIEMCheckMc \
+        tstSSM \
         tstVMMR0CallHost-1 \
         tstVMMR0CallHost-2 \
@@ -251 +252 @@
 # Saved state manager testcase.
 #
-if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
-tstSSMHardened_TEMPLATE = VBoxR3HardenedTstExe
-tstSSMHardened_NAME     = tstSSM
-tstSSMHardened_DEFS     = PROGRAM_NAME_STR=\"tstSSM\"
-tstSSMHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
-tstSSM_TEMPLATE         = VBoxR3HardenedTstDll
-else
 tstSSM_TEMPLATE         = VBOXR3TSTEXE
-endif
 tstSSM_INCS             = $(VBOX_PATH_VMM_SRC)/include
 tstSSM_SOURCES          = tstSSM.cpp

trunk/src/VBox/VMM/testcase/tstSSM.cpp

@@ -669 +669 @@
 #ifdef VBOX_BUGREF_9217
                     PVMCPU pVCpu = (PVMCPU)(pVM + 1);
-                    pVM->apCpusR3[0]= pVCpu;
+#else
+                    PVMCPU pVCpu = &pVM->aCpus[0];
+#endif
                     pVCpu->pVMR3 = pVM;
                     pVCpu->hNativeThread = RTThreadNativeSelf();
-#else
-                    pVM->aCpus[0].pVMR3 = pVM;
-                    pVM->aCpus[0].hNativeThread = RTThreadNativeSelf();
-#endif
+                    pVM->apCpusR3[0] = pVCpu;
 
                     pUVM->pVM = pVM;
@@ -715 +714 @@
  *  Entry point.
  */
-extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
-{
-    RT_NOREF1(envp);
-
+int main(int argc, char **argv)
+{
     /*
      * Init runtime and static data.
      */
-#ifdef VBOX_BUGREF_9217
     int rc = RTR3InitExe(argc, &argv, 0);
     AssertRCReturn(rc, RTEXITCODE_INIT);
-#else
-    RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_SUPLIB);
-#endif
     RTPrintf("tstSSM: TESTING...\n");
     initBigMem();
@@ -735 +728 @@
      * Create an fake VM structure and init SSM.
      */
-#ifndef VBOX_BUGREF_9217
-    int rc = SUPR3Init(NULL);
-    if (RT_FAILURE(rc))
-    {
-        RTPrintf("Fatal error: SUP Failure! rc=%Rrc\n", rc);
-        return 1;
-    }
-#endif
     PVM pVM;
     if (createFakeVM(&pVM))
@@ -959 +944 @@
 }
 
-
-#if !defined(VBOX_WITH_HARDENING) || !defined(RT_OS_WINDOWS)
-/**
- * Main entry point.
- */
-int main(int argc, char **argv, char **envp)
-{
-    return TrustedMain(argc, argv, envp);
-}
-#endif
-