Changeset 82883 in vbox for trunk/src/VBox/Devices/testcase/tstDevice.cpp

Timestamp:

Jan 27, 2020 6:20:21 PM (5 years ago)

Author:

vboxsync

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

135863

Message:

Devices/testcase: Restarted work on the device testbench/fuzzing work (#9006), adjusting to the interface changes in 6.1 dropping the VMM stub library which is not required anymore (yay), work in progress

File:

• trunk/src/VBox/Devices/testcase/tstDevice.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/testcase/tstDevice.cpp

@@ -154 +154 @@
     PCTSTDEVPDMMOD                  pPdmMod;
     /** Device registration structure. */
-    const struct PDMDEVREG          *pReg;
+    const PDMDEVREG                 *pReg;
 } TSTDEVPDMDEV;
 /** Pointer to a PDM device descriptor .*/
@@ -204 +204 @@
 RTLISTANCHOR g_LstPdmDevs;
 
-extern const TSTDEVVMMCALLBACKS g_tstDevVmmCallbacks;
-
 /**
  * PDM R0 imports we implement.
@@ -211 +209 @@
 static const TSTDEVPDMR0IMPORTS g_aPdmR0Imports[] =
 {
+#if 0
     {"IOMMMIOMapMMIO2Page",            (PFNRT)IOMMMIOMapMMIO2Page},
     {"IOMMMIOResetRegion",             (PFNRT)IOMMMIOResetRegion},
@@ -255 +254 @@
     {"nocrt_memset",                   (PFNRT)memset},
     {"nocrt_strlen",                   (PFNRT)strlen},
+#else
+    { NULL, NULL }
+#endif
 };
 
@@ -480 +482 @@
                     &&  tstDevPdmR3IsValidName(pReg->szName),
                     ("Invalid name '%.*s'\n", sizeof(pReg->szName), pReg->szName),
-                    VERR_PDM_INVALID_DEVICE_REGISTRATION);
-    AssertMsgReturn(   !(pReg->fFlags & PDM_DEVREG_FLAGS_RC)
-                    || (   pReg->szRCMod[0]
-                        && strlen(pReg->szRCMod) < sizeof(pReg->szRCMod)),
-                    ("Invalid GC module name '%s' - (Device %s)\n", pReg->szRCMod, pReg->szName),
-                    VERR_PDM_INVALID_DEVICE_REGISTRATION);
-    AssertMsgReturn(   !(pReg->fFlags & PDM_DEVREG_FLAGS_R0)
-                    || (   pReg->szR0Mod[0]
-                        && strlen(pReg->szR0Mod) < sizeof(pReg->szR0Mod)),
-                    ("Invalid R0 module name '%s' - (Device %s)\n", pReg->szR0Mod, pReg->szName),
                     VERR_PDM_INVALID_DEVICE_REGISTRATION);
     AssertMsgReturn((pReg->fFlags & PDM_DEVREG_FLAGS_HOST_BITS_MASK) == PDM_DEVREG_FLAGS_HOST_BITS_DEFAULT,
@@ -503 +495 @@
                     ("Max instances %u! (Device %s)\n", pReg->cMaxInstances, pReg->szName),
                     VERR_PDM_INVALID_DEVICE_REGISTRATION);
-    AssertMsgReturn(pReg->cbInstance <= (uint32_t)(pReg->fFlags & (PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0)  ? 96 * _1K : _1M),
-                    ("Instance size %d bytes! (Device %s)\n", pReg->cbInstance, pReg->szName),
+    AssertMsgReturn(pReg->cbInstanceCC <= (uint32_t)(pReg->fFlags & (PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0)  ? 96 * _1K : _1M),
+                    ("Instance size %d bytes! (Device %s)\n", pReg->cbInstanceCC, pReg->szName),
                     VERR_PDM_INVALID_DEVICE_REGISTRATION);
     AssertMsgReturn(pReg->pfnConstruct,
@@ -852 +844 @@
         RTListInit(&Dut.SupSession.LstSupSem);
         CFGMNODE Cfg;
-        Cfg.pVmmCallbacks = &g_tstDevVmmCallbacks;
         Cfg.pDut = &Dut;
 
@@ -858 +849 @@
         AssertRC(rc);
 
-        PPDMDEVINS pDevIns = (PPDMDEVINS)RTMemAllocZ(RT_UOFFSETOF_DYN(PDMDEVINS, achInstanceData[pPdmDev->pReg->cbInstance]));
+        PPDMDEVINS pDevIns = (PPDMDEVINS)RTMemAllocZ(RT_UOFFSETOF_DYN(PDMDEVINS, achInstanceData[pPdmDev->pReg->cbInstanceCC]));
         pDevIns->u32Version               = PDM_DEVINS_VERSION;
         pDevIns->iInstance                = 0;
@@ -865 +856 @@
         pDevIns->pHlpR3                   = &g_tstDevPdmDevHlpR3;
         pDevIns->pCfg                     = &Cfg;
-        pDevIns->Internal.s.pVmmCallbacks = &g_tstDevVmmCallbacks;
         pDevIns->Internal.s.pDut          = &Dut;
         rc = pPdmDev->pReg->pfnConstruct(pDevIns, 0, &Cfg);
@@ -872 +862 @@
             PRTDEVDUTIOPORT pIoPort = RTListGetFirst(&Dut.LstIoPorts, RTDEVDUTIOPORT, NdIoPorts);
             uint32_t uVal = 0;
-            PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);
+            /*PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);*/
             pIoPort->pfnInR0(pDevIns, pIoPort->pvUserR0, pIoPort->PortStart, &uVal, sizeof(uint8_t));
-            PDMCritSectLeave(pDevIns->pCritSectRoR3);
+            /*PDMCritSectLeave(pDevIns->pCritSectRoR3);*/
         }
     }