Changeset 83296 in vbox for trunk/src/VBox/Devices/testcase

Timestamp:

Mar 16, 2020 11:43:32 AM (5 years ago)

Author:

vboxsync

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

136463

Message:

Devices/tstDevice: Copy over and modify PDMThread* API so we can fuzz saved states of device s which delegate some parts of the saved state loading to workers

Location:

trunk/src/VBox/Devices/testcase

Files:

• tstDeviceInternal.h (modified) (3 diffs)
• tstDevicePdmDevHlp.cpp (modified) (8 diffs)
• tstDevicePdmThread.cpp (copied) (copied from trunk/src/VBox/VMM/VMMR3/PDMThread.cpp ) (47 diffs)
• tstDeviceSsmFuzz.cpp (modified) (1 diff)

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

@@ -141 +141 @@
 
 
+/**
+ * The usual device/driver/internal/external stuff.
+ */
+typedef enum
+{
+    /** The usual invalid entry. */
+    PDMTHREADTYPE_INVALID = 0,
+    /** Device type. */
+    PDMTHREADTYPE_DEVICE,
+    /** USB Device type. */
+    PDMTHREADTYPE_USB,
+    /** Driver type. */
+    PDMTHREADTYPE_DRIVER,
+    /** Internal type. */
+    PDMTHREADTYPE_INTERNAL,
+    /** External type. */
+    PDMTHREADTYPE_EXTERNAL,
+    /** The usual 32-bit hack. */
+    PDMTHREADTYPE_32BIT_HACK = 0x7fffffff
+} PDMTHREADTYPE;
+
+
+/**
+ * The internal structure for the thread.
+ */
+typedef struct PDMTHREADINT
+{
+    /** Node for the list of threads. */
+    RTLISTNODE                      NdPdmThrds;
+    /** Pointer to the device under test the allocation was made for. */
+    PTSTDEVDUTINT                   pDut;
+    /** The event semaphore the thread blocks on when not running. */
+    RTSEMEVENTMULTI                 BlockEvent;
+    /** The event semaphore the thread sleeps on while running. */
+    RTSEMEVENTMULTI                 SleepEvent;
+    /** The thread type. */
+    PDMTHREADTYPE                   enmType;
+} PDMTHREADINT;
+
+
+#define PDMTHREADINT_DECLARED
 #define PDMCRITSECTINT_DECLARED
 #define PDMDEVINSINT_DECLARED
@@ -148 +189 @@
 RT_C_DECLS_END
 #include <VBox/vmm/pdmcritsect.h>
+#include <VBox/vmm/pdmthread.h>
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/vmm/pdmpci.h>
@@ -416 +458 @@
 }
 
+DECLHIDDEN(int) tstDevPdmR3ThreadCreateDevice(PTSTDEVDUTINT pDut, PPDMDEVINS pDevIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDEV pfnThread,
+                                              PFNPDMTHREADWAKEUPDEV pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName);
+DECLHIDDEN(int) tstDevPdmR3ThreadCreateUsb(PTSTDEVDUTINT pDut, PPDMUSBINS pUsbIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADUSB pfnThread,
+                                           PFNPDMTHREADWAKEUPUSB pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName);
+DECLHIDDEN(int) tstDevPdmR3ThreadCreateDriver(PTSTDEVDUTINT pDut, PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread,
+                                              PFNPDMTHREADWAKEUPDRV pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName);
+DECLHIDDEN(int) tstDevPdmR3ThreadCreate(PTSTDEVDUTINT pDut, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADINT pfnThread,
+                                        PFNPDMTHREADWAKEUPINT pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName);
+DECLHIDDEN(int) tstDevPdmR3ThreadCreateExternal(PTSTDEVDUTINT pDut, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADEXT pfnThread,
+                                                PFNPDMTHREADWAKEUPEXT pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName);
+DECLHIDDEN(int) tstDevPdmR3ThreadDestroy(PPDMTHREAD pThread, int *pRcThread);
+DECLHIDDEN(int) tstDevPdmR3ThreadDestroyDevice(PTSTDEVDUTINT pDut, PPDMDEVINS pDevIns);
+DECLHIDDEN(int) tstDevPdmR3ThreadDestroyUsb(PTSTDEVDUTINT pDut, PPDMUSBINS pUsbIns);
+DECLHIDDEN(int) tstDevPdmR3ThreadDestroyDriver(PTSTDEVDUTINT pDut, PPDMDRVINS pDrvIns);
+DECLHIDDEN(void) tstDevPdmR3ThreadDestroyAll(PTSTDEVDUTINT pDut);
+DECLHIDDEN(int) tstDevPdmR3ThreadIAmSuspending(PPDMTHREAD pThread);
+DECLHIDDEN(int) tstDevPdmR3ThreadIAmRunning(PPDMTHREAD pThread);
+DECLHIDDEN(int) tstDevPdmR3ThreadSleep(PPDMTHREAD pThread, RTMSINTERVAL cMillies);
+DECLHIDDEN(int) tstDevPdmR3ThreadSuspend(PPDMTHREAD pThread);
+DECLHIDDEN(int) tstDevPdmR3ThreadResume(PPDMTHREAD pThread);
+
+
 RT_C_DECLS_END
 

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

@@ -2707 +2707 @@
              pszDesc, pszDesc, phType));
 
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
+#ifndef VBOX_TSTDEV_NOT_IMPLEMENTED_STUBS_FAKE_SUCCESS
+    int rc = VERR_NOT_IMPLEMENTED;
+    AssertFailed();
+#else
+    int rc = VINF_SUCCESS;
+#endif
 
     LogRel(("pdmR3DevHlp_PGMHandlerPhysicalTypeRegister: caller='%s'/%d: returns %Rrc\n",
@@ -4210 +4214 @@
              pDevIns->pReg->szName, pDevIns->iInstance, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName, pszName));
 
-    RT_NOREF(ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName);
-
-#ifndef VBOX_TSTDEV_NOT_IMPLEMENTED_STUBS_FAKE_SUCCESS
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
-#else
-    int rc = VINF_SUCCESS;
-#endif
+    int rc = tstDevPdmR3ThreadCreateDevice(pDevIns->Internal.s.pDut, pDevIns, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName);
 
     LogFlow(("pdmR3DevHlp_ThreadCreate: caller='%s'/%d: returns %Rrc *ppThread=%RTthrd\n", pDevIns->pReg->szName, pDevIns->iInstance,
@@ -4227 +4224 @@
 static DECLCALLBACK(int) pdmR3DevHlp_ThreadDestroy(PPDMTHREAD pThread, int *pRcThread)
 {
-    RT_NOREF(pThread, pRcThread);
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
-    return rc;
+    return tstDevPdmR3ThreadDestroy(pThread, pRcThread);
 }
 
@@ -4236 +4230 @@
 static DECLCALLBACK(int) pdmR3DevHlp_ThreadIAmSuspending(PPDMTHREAD pThread)
 {
-    RT_NOREF(pThread);
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
-    return rc;
+    return tstDevPdmR3ThreadIAmSuspending(pThread);
 }
 
@@ -4245 +4236 @@
 static DECLCALLBACK(int) pdmR3DevHlp_ThreadIamRunning(PPDMTHREAD pThread)
 {
-    RT_NOREF(pThread);
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
-    return rc;
+    return tstDevPdmR3ThreadIAmRunning(pThread);
 }
 
@@ -4254 +4242 @@
 static DECLCALLBACK(int) pdmR3DevHlp_ThreadSleep(PPDMTHREAD pThread, RTMSINTERVAL cMillies)
 {
-    RT_NOREF(pThread, cMillies);
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
-    return rc;
+    return tstDevPdmR3ThreadSleep(pThread, cMillies);
 }
 
@@ -4263 +4248 @@
 static DECLCALLBACK(int) pdmR3DevHlp_ThreadSuspend(PPDMTHREAD pThread)
 {
-    RT_NOREF(pThread);
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
-    return rc;
+    return tstDevPdmR3ThreadSuspend(pThread);
 }
 
@@ -4272 +4254 @@
 static DECLCALLBACK(int) pdmR3DevHlp_ThreadResume(PPDMTHREAD pThread)
 {
-    RT_NOREF(pThread);
-    int rc = VERR_NOT_IMPLEMENTED;
-    AssertFailed();
-    return rc;
+    return tstDevPdmR3ThreadResume(pThread);
 }
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * PDM Thread - VM Thread Management.
+ * PDM Thread - Thread Management (copied from PDMThread).
  */
 
@@ -21 +21 @@
 *********************************************************************************************************************************/
 /// @todo \#define LOG_GROUP LOG_GROUP_PDM_THREAD
-#include "PDMInternal.h"
-#include <VBox/vmm/pdm.h>
-#include <VBox/vmm/mm.h>
-#include <VBox/vmm/vm.h>
-#include <VBox/vmm/uvm.h>
 #include <VBox/err.h>
-
 #include <VBox/log.h>
+
 #include <iprt/asm.h>
 #include <iprt/semaphore.h>
 #include <iprt/assert.h>
+#include <iprt/mem.h>
 #include <iprt/thread.h>
+
+#include "tstDeviceInternal.h"
 
 
@@ -78 +76 @@
 
         case PDMTHREADTYPE_INTERNAL:
-            rc = pThread->u.Int.pfnWakeUp(pThread->Internal.s.pVM, pThread);
+            rc = pThread->u.Int.pfnWakeUp(NULL /*pVM*/, pThread);
             break;
 
@@ -99 +97 @@
  *
  * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
+ * @param   pDut        The device under test.
  * @param   ppThread    Where to store the pointer to the instance.
  */
-static int pdmR3ThreadNew(PVM pVM, PPPDMTHREAD ppThread)
-{
-    PPDMTHREAD pThread;
-    int rc = MMR3HeapAllocZEx(pVM, MM_TAG_PDM_THREAD, sizeof(*pThread), (void **)&pThread);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    pThread->u32Version     = PDMTHREAD_VERSION;
-    pThread->enmState       = PDMTHREADSTATE_INITIALIZING;
-    pThread->Thread         = NIL_RTTHREAD;
-    pThread->Internal.s.pVM = pVM;
+static int pdmR3ThreadNew(PTSTDEVDUTINT pDut, PPPDMTHREAD ppThread)
+{
+    PPDMTHREAD pThread = (PPDMTHREAD)RTMemAllocZ(sizeof(*pThread));
+    if (!pThread)
+        return VERR_NO_MEMORY;
+
+    pThread->u32Version      = PDMTHREAD_VERSION;
+    pThread->enmState        = PDMTHREADSTATE_INITIALIZING;
+    pThread->Thread          = NIL_RTTHREAD;
+    pThread->Internal.s.pDut = pDut;
 
     *ppThread = pThread;
@@ -124 +121 @@
  *
  * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
+ * @param   pDut        The device under test.
  * @param   ppThread    Where the thread instance data handle is.
  * @param   cbStack     The stack size, see RTThreadCreate().
@@ -130 +127 @@
  * @param   pszName     The thread name, see RTThreadCreate().
  */
-static int pdmR3ThreadInit(PVM pVM, PPPDMTHREAD ppThread, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
+static int pdmR3ThreadInit(PTSTDEVDUTINT pDut, PPPDMTHREAD ppThread, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
 {
     PPDMTHREAD  pThread = *ppThread;
-    PUVM        pUVM    = pVM->pUVM;
-
-    /*
-     * Initialize the remainder of the structure.
-     */
-    pThread->Internal.s.pVM = pVM;
 
     int rc = RTSemEventMultiCreate(&pThread->Internal.s.BlockEvent);
@@ -163 +154 @@
                      * Insert it into the thread list.
                      */
-                    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
-                    pThread->Internal.s.pNext = NULL;
-                    if (pUVM->pdm.s.pThreadsTail)
-                        pUVM->pdm.s.pThreadsTail->Internal.s.pNext = pThread;
-                    else
-                        pUVM->pdm.s.pThreads = pThread;
-                    pUVM->pdm.s.pThreadsTail = pThread;
-                    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
+                    tstDevDutLockExcl(pDut);
+                    RTListAppend(&pDut->LstPdmThreads, &pThread->Internal.s.NdPdmThrds);
+                    tstDevDutUnlockExcl(pDut);
 
                     rc = RTThreadUserReset(Thread);
@@ -186 +172 @@
         pThread->Internal.s.BlockEvent = NIL_RTSEMEVENTMULTI;
     }
-    MMR3HeapFree(pThread);
+    RTMemFree(pThread);
     *ppThread = NULL;
 
@@ -197 +183 @@
  *
  * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
+ * @param   pDut        The device under test.
  * @param   pDevIns     The device instance.
  * @param   ppThread    Where to store the thread 'handle'.
@@ -208 +194 @@
  * @param   pszName     See RTThreadCreate.
  */
-int pdmR3ThreadCreateDevice(PVM pVM, PPDMDEVINS pDevIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDEV pfnThread,
-                            PFNPDMTHREADWAKEUPDEV pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
-{
-    int rc = pdmR3ThreadNew(pVM, ppThread);
+DECLHIDDEN(int) tstDevPdmR3ThreadCreateDevice(PTSTDEVDUTINT pDut, PPDMDEVINS pDevIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDEV pfnThread,
+                                              PFNPDMTHREADWAKEUPDEV pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
+{
+    int rc = pdmR3ThreadNew(pDut, ppThread);
     if (RT_SUCCESS(rc))
     {
@@ -220 +206 @@
         pThread->u.Dev.pfnThread = pfnThread;
         pThread->u.Dev.pfnWakeUp = pfnWakeUp;
-        rc = pdmR3ThreadInit(pVM, ppThread, cbStack, enmType, pszName);
+        rc = pdmR3ThreadInit(pDut, ppThread, cbStack, enmType, pszName);
     }
     return rc;
@@ -230 +216 @@
  *
  * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
+ * @param   pDut        The device under test.
  * @param   pUsbIns     The USB device instance.
  * @param   ppThread    Where to store the thread 'handle'.
@@ -241 +227 @@
  * @param   pszName     See RTThreadCreate.
  */
-int pdmR3ThreadCreateUsb(PVM pVM, PPDMUSBINS pUsbIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADUSB pfnThread,
-                         PFNPDMTHREADWAKEUPUSB pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
-{
-    int rc = pdmR3ThreadNew(pVM, ppThread);
+DECLHIDDEN(int) tstDevPdmR3ThreadCreateUsb(PTSTDEVDUTINT pDut, PPDMUSBINS pUsbIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADUSB pfnThread,
+                                           PFNPDMTHREADWAKEUPUSB pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
+{
+    int rc = pdmR3ThreadNew(pDut, ppThread);
     if (RT_SUCCESS(rc))
     {
@@ -253 +239 @@
         pThread->u.Usb.pfnThread = pfnThread;
         pThread->u.Usb.pfnWakeUp = pfnWakeUp;
-        rc = pdmR3ThreadInit(pVM, ppThread, cbStack, enmType, pszName);
+        rc = pdmR3ThreadInit(pDut, ppThread, cbStack, enmType, pszName);
     }
     return rc;
@@ -263 +249 @@
  *
  * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
+ * @param   pDut        The device under test.
  * @param   pDrvIns     The driver instance.
  * @param   ppThread    Where to store the thread 'handle'.
@@ -274 +260 @@
  * @param   pszName     See RTThreadCreate.
  */
-int pdmR3ThreadCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread,
-                            PFNPDMTHREADWAKEUPDRV pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
-{
-    int rc = pdmR3ThreadNew(pVM, ppThread);
+DECLHIDDEN(int) tstDevPdmR3ThreadCreateDriver(PTSTDEVDUTINT pDut, PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread,
+                                              PFNPDMTHREADWAKEUPDRV pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
+{
+    int rc = pdmR3ThreadNew(pDut, ppThread);
     if (RT_SUCCESS(rc))
     {
@@ -286 +272 @@
         pThread->u.Drv.pfnThread = pfnThread;
         pThread->u.Drv.pfnWakeUp = pfnWakeUp;
-        rc = pdmR3ThreadInit(pVM, ppThread, cbStack, enmType, pszName);
+        rc = pdmR3ThreadInit(pDut, ppThread, cbStack, enmType, pszName);
     }
     return rc;
@@ -296 +282 @@
  *
  * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
+ * @param   pDut        The device under test.
  * @param   ppThread    Where to store the thread 'handle'.
  * @param   pvUser      The user argument to the thread function.
@@ -306 +292 @@
  * @param   pszName     See RTThreadCreate.
  */
-VMMR3DECL(int) PDMR3ThreadCreate(PVM pVM, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADINT pfnThread,
-                                 PFNPDMTHREADWAKEUPINT pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
-{
-    int rc = pdmR3ThreadNew(pVM, ppThread);
+DECLHIDDEN(int) tstDevPdmR3ThreadCreate(PTSTDEVDUTINT pDut, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADINT pfnThread,
+                                        PFNPDMTHREADWAKEUPINT pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
+{
+    int rc = pdmR3ThreadNew(pDut, ppThread);
     if (RT_SUCCESS(rc))
     {
@@ -317 +303 @@
         pThread->u.Int.pfnThread = pfnThread;
         pThread->u.Int.pfnWakeUp = pfnWakeUp;
-        rc = pdmR3ThreadInit(pVM, ppThread, cbStack, enmType, pszName);
+        rc = pdmR3ThreadInit(pDut, ppThread, cbStack, enmType, pszName);
     }
     return rc;
@@ -327 +313 @@
  *
  * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
+ * @param   pDut        The device under test.
  * @param   ppThread    Where to store the thread 'handle'.
  * @param   pvUser      The user argument to the thread function.
@@ -337 +323 @@
  * @param   pszName     See RTThreadCreate.
  */
-VMMR3DECL(int) PDMR3ThreadCreateExternal(PVM pVM, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADEXT pfnThread,
-                                         PFNPDMTHREADWAKEUPEXT pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
-{
-    int rc = pdmR3ThreadNew(pVM, ppThread);
+DECLHIDDEN(int) tstDevPdmR3ThreadCreateExternal(PTSTDEVDUTINT pDut, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADEXT pfnThread,
+                                                PFNPDMTHREADWAKEUPEXT pfnWakeUp, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
+{
+    int rc = pdmR3ThreadNew(pDut, ppThread);
     if (RT_SUCCESS(rc))
     {
@@ -348 +334 @@
         pThread->u.Ext.pfnThread = pfnThread;
         pThread->u.Ext.pfnWakeUp = pfnWakeUp;
-        rc = pdmR3ThreadInit(pVM, ppThread, cbStack, enmType, pszName);
+        rc = pdmR3ThreadInit(pDut, ppThread, cbStack, enmType, pszName);
     }
     return rc;
@@ -366 +352 @@
  * @thread  The emulation thread (EMT).
  */
-VMMR3DECL(int) PDMR3ThreadDestroy(PPDMTHREAD pThread, int *pRcThread)
+DECLHIDDEN(int) tstDevPdmR3ThreadDestroy(PPDMTHREAD pThread, int *pRcThread)
 {
     /*
@@ -375 +361 @@
     Assert(pThread->Thread != RTThreadSelf());
     AssertPtrNullReturn(pRcThread, VERR_INVALID_POINTER);
-    PVM pVM = pThread->Internal.s.pVM;
-    VM_ASSERT_EMT(pVM);
-    PUVM pUVM = pVM->pUVM;
+
+    PTSTDEVDUTINT pDut = pThread->Internal.s.pDut;
 
     /*
@@ -431 +416 @@
 
         /* unlink */
-        RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
-        if (pUVM->pdm.s.pThreads == pThread)
-        {
-            pUVM->pdm.s.pThreads = pThread->Internal.s.pNext;
-            if (!pThread->Internal.s.pNext)
-                pUVM->pdm.s.pThreadsTail = NULL;
-        }
-        else
-        {
-            PPDMTHREAD pPrev = pUVM->pdm.s.pThreads;
-            while (pPrev && pPrev->Internal.s.pNext != pThread)
-                pPrev = pPrev->Internal.s.pNext;
-            Assert(pPrev);
-            if (pPrev)
-                pPrev->Internal.s.pNext = pThread->Internal.s.pNext;
-            if (!pThread->Internal.s.pNext)
-                pUVM->pdm.s.pThreadsTail = pPrev;
-        }
-        pThread->Internal.s.pNext = NULL;
-        RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
+        tstDevDutLockExcl(pDut);
+        RTListNodeRemove(&pThread->Internal.s.NdPdmThrds);
+        tstDevDutUnlockExcl(pDut);
 
         /* free the resources */
@@ -459 +427 @@
         pThread->Internal.s.SleepEvent = NIL_RTSEMEVENTMULTI;
 
-        MMR3HeapFree(pThread);
+        RTMemFree(pThread);
     }
     else if (RT_SUCCESS(rc))
@@ -475 +443 @@
  *
  * @returns VBox status code of the first failure.
- * @param   pVM         The cross context VM structure.
+ * @param   pDut        The device under test.
  * @param   pDevIns     the device instance.
  */
-int pdmR3ThreadDestroyDevice(PVM pVM, PPDMDEVINS pDevIns)
-{
-    int     rc   = VINF_SUCCESS;
-    PUVM    pUVM = pVM->pUVM;
+DECLHIDDEN(int) tstDevPdmR3ThreadDestroyDevice(PTSTDEVDUTINT pDut, PPDMDEVINS pDevIns)
+{
+    int rc = VINF_SUCCESS;
 
     AssertPtr(pDevIns);
 
-    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    tstDevDutLockExcl(pDut);
+#if 0
     PPDMTHREAD pThread = pUVM->pdm.s.pThreads;
     while (pThread)
@@ -499 +467 @@
         pThread = pNext;
     }
-    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
+#endif
+    tstDevDutUnlockExcl(pDut);
     return rc;
 }
@@ -510 +479 @@
  *
  * @returns VBox status code of the first failure.
- * @param   pVM         The cross context VM structure.
+ * @param   pDut        The device under test.
  * @param   pUsbIns     The USB device instance.
  */
-int pdmR3ThreadDestroyUsb(PVM pVM, PPDMUSBINS pUsbIns)
-{
-    int     rc   = VINF_SUCCESS;
-    PUVM    pUVM = pVM->pUVM;
+DECLHIDDEN(int) tstDevPdmR3ThreadDestroyUsb(PTSTDEVDUTINT pDut, PPDMUSBINS pUsbIns)
+{
+    int rc = VINF_SUCCESS;
 
     AssertPtr(pUsbIns);
 
-    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    tstDevDutLockExcl(pDut);
+#if 0
     PPDMTHREAD pThread = pUVM->pdm.s.pThreads;
     while (pThread)
@@ -534 +503 @@
         pThread = pNext;
     }
-    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
+#endif
+    tstDevDutUnlockExcl(pDut);
     return rc;
 }
@@ -545 +515 @@
  *
  * @returns VBox status code of the first failure.
- * @param   pVM         The cross context VM structure.
+ * @param   pDut        The device under test.
  * @param   pDrvIns     The driver instance.
  */
-int pdmR3ThreadDestroyDriver(PVM pVM, PPDMDRVINS pDrvIns)
-{
-    int     rc   = VINF_SUCCESS;
-    PUVM    pUVM = pVM->pUVM;
+DECLHIDDEN(int) tstDevPdmR3ThreadDestroyDriver(PTSTDEVDUTINT pDut, PPDMDRVINS pDrvIns)
+{
+    int rc = VINF_SUCCESS;
 
     AssertPtr(pDrvIns);
 
-    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    tstDevDutLockExcl(pDut);
+#if 0
     PPDMTHREAD pThread = pUVM->pdm.s.pThreads;
     while (pThread)
@@ -569 +539 @@
         pThread = pNext;
     }
-    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
+#endif
+    tstDevDutUnlockExcl(pDut);
     return rc;
 }
@@ -577 +548 @@
  * Called For VM power off.
  *
- * @param   pVM         The cross context VM structure.
- */
-void pdmR3ThreadDestroyAll(PVM pVM)
-{
-    PUVM pUVM = pVM->pUVM;
-    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+ * @param   pDut        The device under test.
+ */
+DECLHIDDEN(void) tstDevPdmR3ThreadDestroyAll(PTSTDEVDUTINT pDut)
+{
+    tstDevDutLockExcl(pDut);
+#if 0
     PPDMTHREAD pThread = pUVM->pdm.s.pThreads;
     while (pThread)
@@ -592 +563 @@
     }
     Assert(!pUVM->pdm.s.pThreads && !pUVM->pdm.s.pThreadsTail);
-    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
+#endif
+    tstDevDutUnlockExcl(pDut);
 }
 
@@ -642 +614 @@
  * @param   pThread     The PDM thread.
  */
-VMMR3DECL(int) PDMR3ThreadIAmSuspending(PPDMTHREAD pThread)
+DECLHIDDEN(int) tstDevPdmR3ThreadIAmSuspending(PPDMTHREAD pThread)
 {
     /*
@@ -690 +662 @@
  * @param   pThread     The PDM thread.
  */
-VMMR3DECL(int) PDMR3ThreadIAmRunning(PPDMTHREAD pThread)
+DECLHIDDEN(int) tstDevPdmR3ThreadIAmRunning(PPDMTHREAD pThread)
 {
     /*
@@ -728 +700 @@
  * @param   cMillies    The number of milliseconds to sleep.
  */
-VMMR3DECL(int) PDMR3ThreadSleep(PPDMTHREAD pThread, RTMSINTERVAL cMillies)
+DECLHIDDEN(int) tstDevPdmR3ThreadSleep(PPDMTHREAD pThread, RTMSINTERVAL cMillies)
 {
     /*
@@ -759 +731 @@
     Log(("PDMThread: Initializing thread %RTthrd / %p / '%s'...\n", Thread, pThread, RTThreadGetName(Thread)));
     pThread->Thread = Thread;
-
-    PUVM pUVM = pThread->Internal.s.pVM->pUVM;
-    if (   pUVM->pVmm2UserMethods
-        && pUVM->pVmm2UserMethods->pfnNotifyPdmtInit)
-        pUVM->pVmm2UserMethods->pfnNotifyPdmtInit(pUVM->pVmm2UserMethods, pUVM);
 
     /*
@@ -790 +757 @@
 
             case PDMTHREADTYPE_INTERNAL:
-                rc = pThread->u.Int.pfnThread(pThread->Internal.s.pVM, pThread);
+                rc = pThread->u.Int.pfnThread(NULL /*pVM*/, pThread);
                 break;
 
@@ -815 +782 @@
             break;
         }
-        rc = PDMR3ThreadIAmSuspending(pThread);
+        rc = tstDevPdmR3ThreadIAmSuspending(pThread);
         if (RT_FAILURE(rc))
             break;
@@ -824 +791 @@
         }
 
-        rc = PDMR3ThreadIAmRunning(pThread);
+        rc = tstDevPdmR3ThreadIAmRunning(pThread);
         if (RT_FAILURE(rc))
             break;
@@ -846 +813 @@
     int rc2 = RTThreadUserSignal(Thread); AssertRC(rc2);
 
-    if (   pUVM->pVmm2UserMethods
-        && pUVM->pVmm2UserMethods->pfnNotifyPdmtTerm)
-        pUVM->pVmm2UserMethods->pfnNotifyPdmtTerm(pUVM->pVmm2UserMethods, pUVM);
     Log(("PDMThread: Terminating thread %RTthrd / %p / '%s': %Rrc\n", Thread, pThread, RTThreadGetName(Thread), rc));
     return rc;
@@ -911 +875 @@
  * @param   pThread     The PDM thread.
  */
-VMMR3DECL(int) PDMR3ThreadSuspend(PPDMTHREAD pThread)
+DECLHIDDEN(int) tstDevPdmR3ThreadSuspend(PPDMTHREAD pThread)
 {
     /*
@@ -967 +931 @@
 
 /**
- * Suspend all running threads.
- *
- * This is called by PDMR3Suspend() and PDMR3PowerOff() after all the devices
- * and drivers have been notified about the suspend / power off.
- *
- * @return VBox status code.
- * @param   pVM         The cross context VM structure.
- */
-int pdmR3ThreadSuspendAll(PVM pVM)
-{
-    PUVM pUVM = pVM->pUVM;
-    RTCritSectEnter(&pUVM->pdm.s.ListCritSect); /* This may cause deadlocks later... */
-    for (PPDMTHREAD pThread = pUVM->pdm.s.pThreads; pThread; pThread = pThread->Internal.s.pNext)
-        switch (pThread->enmState)
-        {
-            case PDMTHREADSTATE_RUNNING:
-            {
-                int rc = PDMR3ThreadSuspend(pThread);
-                AssertLogRelMsgReturnStmt(RT_SUCCESS(rc),
-                                          ("PDMR3ThreadSuspend -> %Rrc for '%s'\n", rc, RTThreadGetName(pThread->Thread)),
-                                          RTCritSectLeave(&pUVM->pdm.s.ListCritSect),
-                                          rc);
-                break;
-            }
-
-            /* suspend -> power off; voluntary suspend. */
-            case PDMTHREADSTATE_SUSPENDED:
-                break;
-
-            default:
-                AssertMsgFailed(("pThread=%p enmState=%d\n", pThread, pThread->enmState));
-                break;
-        }
-    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
-    return VINF_SUCCESS;
-}
-
-
-/**
  * Resumes the thread.
  *
@@ -1018 +943 @@
  * @param   pThread     The PDM thread.
  */
-VMMR3DECL(int) PDMR3ThreadResume(PPDMTHREAD pThread)
+DECLHIDDEN(int) tstDevPdmR3ThreadResume(PPDMTHREAD pThread)
 {
     /*
@@ -1060 +985 @@
 }
 
-
-/**
- * Resumes all threads not running.
- *
- * This is called by PDMR3Resume() and PDMR3PowerOn() after all the devices
- * and drivers have been notified about the resume / power on .
- *
- * @return VBox status code.
- * @param   pVM         The cross context VM structure.
- */
-int pdmR3ThreadResumeAll(PVM pVM)
-{
-    PUVM pUVM = pVM->pUVM;
-    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
-    for (PPDMTHREAD pThread = pUVM->pdm.s.pThreads; pThread; pThread = pThread->Internal.s.pNext)
-        switch (pThread->enmState)
-        {
-            case PDMTHREADSTATE_SUSPENDED:
-            {
-                int rc = PDMR3ThreadResume(pThread);
-                AssertRCReturn(rc, rc);
-                break;
-            }
-
-            default:
-                AssertMsgFailed(("pThread=%p enmState=%d\n", pThread, pThread->enmState));
-                break;
-        }
-    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
-    return VINF_SUCCESS;
-}
-

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

@@ -104 +104 @@
     if (RT_SUCCESS(rc))
     {
-        rc = RTFuzzCtxCorpusInputAddFromDirPath(hFuzzCtx, tstDevSsmFuzzGetCfgString(paCfg, cCfgItems, "CorpusPath"));
+        uint64_t cbMutateRange = tstDevSsmFuzzGetCfgU64(paCfg, cCfgItems, "OffMutateSize");
+        if (!cbMutateRange)
+            cbMutateRange = UINT64_MAX;
+
+        rc = RTFuzzCtxCfgSetMutationRange(hFuzzCtx,
+                                          tstDevSsmFuzzGetCfgU64(paCfg, cCfgItems, "OffMutateStart"),
+                                          cbMutateRange);
+        if (RT_SUCCESS(rc))
+            rc = RTFuzzCtxCorpusInputAddFromDirPath(hFuzzCtx, tstDevSsmFuzzGetCfgString(paCfg, cCfgItems, "CorpusPath"));
         if (RT_SUCCESS(rc))
         {