Changeset 82904 in vbox for trunk

Timestamp:

Jan 29, 2020 12:19:30 PM (5 years ago)

Author:

vboxsync

Message:

Devices/tstDevice: Continue stubbing/implementing more PDM device helper callbacks, bugref:9006

Location:

trunk/src/VBox/Devices/testcase

Files:

• tstDevice.cpp (modified) (1 diff)
• tstDeviceInternal.h (modified) (3 diffs)
• tstDevicePdmDevHlp.cpp (modified) (10 diffs)

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

@@ -849 +849 @@
         AssertRC(rc);
 
+        rc = RTCritSectInitEx(&Dut.CritSectNop.s.CritSect, RTCRITSECT_FLAGS_NOP, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_NONE, "DutNop");
+        AssertRC(rc);
+
         PPDMCRITSECT pCritSect;
         /* Figure out how much we need. */

trunk/src/VBox/Devices/testcase/tstDeviceInternal.h

@@ -149 +149 @@
     /** Flags. */
     uint32_t             fFlags;
+    /** Assigned critical section. */
+    PPDMCRITSECT         pCritSect;
     /** @todo: */
 } TMTIMER;
@@ -220 +222 @@
 /** Pointer to a const I/O port handler. */
 typedef const RTDEVDUTIOPORT *PCRTDEVDUTIOPORT;
+
+
+/**
+ * Registered SSM handlers.
+ */
+typedef struct TSTDEVDUTSSM
+{
+    /** Node for the list of registered SSM handlers. */
+    RTLISTNODE                      NdSsm;
+    /** Version */
+    uint32_t                        uVersion;
+    PFNSSMDEVLIVEPREP               pfnLivePrep;
+    PFNSSMDEVLIVEEXEC               pfnLiveExec;
+    PFNSSMDEVLIVEVOTE               pfnLiveVote;
+    PFNSSMDEVSAVEPREP               pfnSavePrep;
+    PFNSSMDEVSAVEEXEC               pfnSaveExec;
+    PFNSSMDEVSAVEDONE               pfnSaveDone;
+    PFNSSMDEVLOADPREP               pfnLoadPrep;
+    PFNSSMDEVLOADEXEC               pfnLoadExec;
+    PFNSSMDEVLOADDONE               pfnLoadDone;
+} TSTDEVDUTSSM;
+/** Pointer to the registered SSM handlers. */
+typedef TSTDEVDUTSSM *PTSTDEVDUTSSM;
+/** Pointer to a const SSM handler. */
+typedef const TSTDEVDUTSSM *PCTSTDEVDUTSSM;
+
 
 /**
@@ -320 +348 @@
     /** List of PDM threads. */
     RTLISTANCHOR                    LstPdmThreads;
+    /** List of SSM handlers (just one normally). */
+    RTLISTANCHOR                    LstSsmHandlers;
     /** The SUP session we emulate. */
     TSTDEVSUPDRVSESSION             SupSession;
+    /** The NOP critical section. */
+    PDMCRITSECT                     CritSectNop;
     /** The VM state associated with this device. */
     PVM                             pVm;

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

@@ -122 +122 @@
              pvUser, pszDesc, pszDesc, paExtDescs, phIoPorts));
 
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
+    /** @todo Verify there is no overlapping. */
+
+    RT_NOREF(pszDesc);
+    int rc = VINF_SUCCESS;
+    PRTDEVDUTIOPORT pIoPort = (PRTDEVDUTIOPORT)RTMemAllocZ(sizeof(RTDEVDUTIOPORT));
+    if (RT_LIKELY(pIoPort))
+    {
+        pIoPort->cPorts      = cPorts;
+        pIoPort->pvUserR3    = pvUser;
+        pIoPort->pfnOutR3    = pfnOut;
+        pIoPort->pfnInR3     = pfnIn;
+        pIoPort->pfnOutStrR3 = pfnOutStr;
+        pIoPort->pfnInStrR3  = pfnInStr;
+        RTListAppend(&pDevIns->Internal.s.pDut->LstIoPorts, &pIoPort->NdIoPorts);
+        *phIoPorts = (IOMIOPORTHANDLE)pIoPort;
+    }
+    else
+        rc = VERR_NO_MEMORY;
 
     LogFlow(("pdmR3DevHlp_IoPortCreateEx: caller='%s'/%d: returns %Rrc (*phIoPorts=%#x)\n",
@@ -137 +153 @@
     LogFlow(("pdmR3DevHlp_IoPortMap: caller='%s'/%d: hIoPorts=%#x Port=%#x\n", pDevIns->pReg->szName, pDevIns->iInstance, hIoPorts, Port));
 
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
-
-    LogFlow(("pdmR3DevHlp_IoPortMap: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
-    return rc;
+    PRTDEVDUTIOPORT pIoPort = (PRTDEVDUTIOPORT)hIoPorts;
+    pIoPort->PortStart = Port;
+
+    LogFlow(("pdmR3DevHlp_IoPortMap: caller='%s'/%d: returns VINF_SUCCESS\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS));
+    return VINF_SUCCESS;
 }
 
@@ -395 +411 @@
              pfnLoadPrep, pfnLoadExec, pfnLoadDone));
 
-    RT_NOREF(uVersion, cbGuess, pszBefore, pfnLivePrep, pfnLiveExec, pfnLiveVote, pfnSavePrep, pfnSaveExec, pfnSaveDone,
-             pfnLoadPrep, pfnLoadExec, pfnLoadDone);
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
+    RT_NOREF(cbGuess, pszBefore);
+    int rc = VINF_SUCCESS;
+    PTSTDEVDUTSSM pSsm = (PTSTDEVDUTSSM)RTMemAllocZ(sizeof(*pSsm));
+    if (RT_LIKELY(pSsm))
+    {
+        pSsm->uVersion      = uVersion;
+        pSsm->pfnLivePrep   = pfnLivePrep;
+        pSsm->pfnLiveExec   = pfnLiveExec;
+        pSsm->pfnLiveVote   = pfnLiveVote;
+        pSsm->pfnSavePrep   = pfnSavePrep;
+        pSsm->pfnSaveExec   = pfnSaveExec;
+        pSsm->pfnSaveDone   = pfnSaveDone;
+        pSsm->pfnLoadPrep   = pfnLoadPrep;
+        pSsm->pfnLoadExec   = pfnLoadExec;
+        pSsm->pfnLoadDone   = pfnLoadDone;
+        RTListAppend(&pDevIns->Internal.s.pDut->LstSsmHandlers, &pSsm->NdSsm);
+    }
+    else
+        rc = VERR_NO_MEMORY;
 
     LogFlow(("pdmR3DevHlp_SSMRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
@@ -1093 +1124 @@
              pDevIns->pReg->szName, pDevIns->iInstance, enmClock, pfnCallback, pvUser, fFlags, pszDesc, pszDesc, phTimer));
 
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
+    int rc = VINF_SUCCESS;
+    PTMTIMERR3 pTimer = (PTMTIMERR3)RTMemAllocZ(sizeof(TMTIMER));
+    if (RT_LIKELY(pTimer))
+    {
+        pTimer->enmClock       = enmClock;
+        pTimer->pfnCallbackDev = pfnCallback;
+        pTimer->pvUser         = pvUser;
+        pTimer->fFlags         = fFlags;
+        RTListAppend(&pDevIns->Internal.s.pDut->LstTimers, &pTimer->NdDevTimers);
+        *phTimer = (TMTIMERHANDLE)pTimer;
+    }
+    else
+        rc = VERR_NO_MEMORY;
 
     LogFlow(("pdmR3DevHlp_TimerCreate: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
@@ -1279 +1321 @@
 {
     RT_NOREF(pDevIns, hTimer);
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
+
+#if 1 /** @todo */
+    int rc = VINF_SUCCESS;
+#else
+    int rc = VERR_NOT_IMPLEMENTED;
+    AssertFailed();
+#endif
+
     return rc;
 }
@@ -1304 +1352 @@
 static DECLCALLBACK(int) pdmR3DevHlp_TimerSetCritSect(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, PPDMCRITSECT pCritSect)
 {
-    RT_NOREF(pDevIns, hTimer, pCritSect);
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
-    return rc;
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+
+    PTMTIMERR3 pTimer = (PTMTIMERR3)hTimer;
+    pTimer->pCritSect = pCritSect;
+    return VINF_SUCCESS;
 }
 
@@ -2844 +2893 @@
              pDevIns->pReg->szName, pDevIns->iInstance, iLun, pBaseInterface, ppBaseInterface, pszDesc, pszDesc));
 
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
+#if 1
+    int rc = VERR_PDM_NO_ATTACHED_DRIVER;
+#else
+    int rc = VERR_NOT_IMPLEMENTED;
+    AssertFailed();
+#endif
 
     LogFlow(("pdmR3DevHlp_DriverAttach: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
@@ -3251 +3304 @@
              pDevIns->pReg->szName, pDevIns->iInstance, pCritSect, pszNameFmt, pszNameFmt));
 
-    RT_NOREF(pDevIns, pCritSect, RT_SRC_POS_ARGS, pszNameFmt, va);
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
+    RT_NOREF(RT_SRC_POS_ARGS, pszNameFmt, va);
+    int rc = RTCritSectInit(&pCritSect->s.CritSect);
 
     LogFlow(("pdmR3DevHlp_CritSectInit: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
@@ -3265 +3317 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
 
-    PPDMCRITSECT pCritSect = NULL;
-    AssertFailed();
+    PPDMCRITSECT pCritSect = &pDevIns->Internal.s.pDut->CritSectNop;
 
     LogFlow(("pdmR3DevHlp_CritSectGetNop: caller='%s'/%d: return %p\n",
@@ -3303 +3354 @@
     /*
      * Validate input.
-     *
-     * Note! We only allow the automatically created default critical section
-     *       to be replaced by this API.
      */
     PDMDEV_ASSERT_DEVINS(pDevIns);
     AssertPtrReturn(pCritSect, VERR_INVALID_POINTER);
 
-#if 0
-    LogFlow(("pdmR3DevHlp_SetDeviceCritSect: caller='%s'/%d: pCritSect=%p (%s)\n",
-             pDevIns->pReg->szName, pDevIns->iInstance, pCritSect, pCritSect->s.pszName));
-#endif
-
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
-
-    LogFlow(("pdmR3DevHlp_SetDeviceCritSect: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
-    return rc;
+    LogFlow(("pdmR3DevHlp_SetDeviceCritSect: caller='%s'/%d: pCritSect=%p\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, pCritSect));
+
+    pDevIns->pCritSectRoR3 = pCritSect;
+    LogFlow(("pdmR3DevHlp_SetDeviceCritSect: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS));
+    return VINF_SUCCESS;
 }