Changeset 91046 in vbox for trunk/src/VBox/Devices/Security

Timestamp:

Sep 1, 2021 7:52:43 AM (3 years ago)

Author:

vboxsync

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

146695

Message:

Devices/Makefile.kmk,Security: Some cleanups, bugref:10075

File:

• trunk/src/VBox/Devices/Security/DrvTpmEmu.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Security/DrvTpmEmu.cpp

@@ -44 +44 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
-
-#define DRVTPMEMU_POLLSET_ID_SOCKET_CTRL 0
-#define DRVTPMEMU_POLLSET_ID_SOCKET_DATA 1
-#define DRVTPMEMU_POLLSET_ID_WAKEUP      2
 
 
@@ -292 +288 @@
     RTSOCKET            hSockData;
 
-#if 0
-    /** Poll set used to wait for I/O events. */
-    RTPOLLSET           hPollSet;
-    /** Reading end of the wakeup pipe. */
-    RTPIPE              hPipeWakeR;
-    /** Writing end of the wakeup pipe. */
-    RTPIPE              hPipeWakeW;
-
-    /** Flag to signal listening thread to shut down. */
-    bool volatile       fShutdown;
-    /** Flag to signal whether the thread was woken up from external. */
-    bool volatile       fWokenUp;
-#endif
-
     /** Currently set locality. */
     uint8_t             bLoc;
@@ -454 +436 @@
 
 /**
- * Executes the given command over the control connection to the TPM emulator - variant with no command payload.
+ * Executes the given command over the control connection to the TPM emulator - variant with no command and response payload.
  *
  * @returns VBox status code.
@@ -460 +442 @@
  * @param   pThis               Pointer to the TPM emulator driver instance data.
  * @param   enmCmd              The command to execute.
- * @param   pvResp              Where to store additional resposne data.
- * @param   cbResp              Size of the Response data in bytes (excluding the response status code which is implicit).
  * @param   cMillies            Number of milliseconds to wait before aborting the command with a timeout error.
  */
@@ -811 +791 @@
     if (pThis->hSockCtrl != NIL_RTSOCKET)
     {
-#if 0
-        int rc = RTPollSetRemove(pThis->hPollSet, DRVTPMEMU_POLLSET_ID_SOCKET_CTRL);
-        AssertRC(rc);
-#endif
-
         int rc = RTSocketShutdown(pThis->hSockCtrl, true /* fRead */, true /* fWrite */);
         AssertRC(rc);
@@ -827 +802 @@
     if (pThis->hSockData != NIL_RTSOCKET)
     {
-#if 0
-        int rc = RTPollSetRemove(pThis->hPollSet, DRVTPMEMU_POLLSET_ID_SOCKET_DATA);
-        AssertRC(rc);
-#endif
-
         int rc = RTSocketShutdown(pThis->hSockData, true /* fRead */, true /* fWrite */);
         AssertRC(rc);
@@ -840 +810 @@
         pThis->hSockCtrl = NIL_RTSOCKET;
     }
-
-#if 0
-    if (pThis->hPipeWakeR != NIL_RTPIPE)
-    {
-        int rc = RTPipeClose(pThis->hPipeWakeR);
-        AssertRC(rc);
-
-        pThis->hPipeWakeR = NIL_RTPIPE;
-    }
-
-    if (pThis->hPipeWakeW != NIL_RTPIPE)
-    {
-        int rc = RTPipeClose(pThis->hPipeWakeW);
-        AssertRC(rc);
-
-        pThis->hPipeWakeW = NIL_RTPIPE;
-    }
-
-    if (pThis->hPollSet != NIL_RTPOLLSET)
-    {
-        int rc = RTPollSetDestroy(pThis->hPollSet);
-        AssertRC(rc);
-
-        pThis->hPollSet = NIL_RTPOLLSET;
-    }
-#endif
 }
 
@@ -884 +828 @@
     pThis->enmTpmVers                               = TPMVERSION_UNKNOWN;
     pThis->bLoc                                     = TPM_NO_LOCALITY_SELECTED;
-
-#if 0
-    pThis->hPollSet                                 = NIL_RTPOLLSET;
-    pThis->hPipeWakeR                               = NIL_RTPIPE;
-    pThis->hPipeWakeW                               = NIL_RTPIPE;
-#endif
 
     /* IBase */
@@ -916 +854 @@
                                    N_("Configuration error: querying \"Location\" resulted in %Rrc"), rc);
 
-#if 0
-    rc = RTPipeCreate(&pThis->hPipeWakeR, &pThis->hPipeWakeW, 0 /* fFlags */);
-    if (RT_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                   N_("DrvTpmEmu#%d: Failed to create wake pipe"), pDrvIns->iInstance);
-
-    rc = RTPollSetCreate(&pThis->hPollSet);
-    if (RT_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                   N_("DrvTpmEmu#%d: Failed to create poll set"), pDrvIns->iInstance);
-
-    rc = RTPollSetAddPipe(pThis->hPollSet, pThis->hPipeWakeR,
-                            RTPOLL_EVT_READ | RTPOLL_EVT_ERROR,
-                            DRVTPMEMU_POLLSET_ID_WAKEUP);
-    if (RT_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                   N_("DrvTpmEmu#%d failed to add wakeup pipe for %s to poll set"),
-                                   pDrvIns->iInstance, szLocation);
-#endif
-
     /*
      * Create/Open the socket.
@@ -959 +877 @@
                                    N_("DrvTpmEmu#%d failed to connect to control socket %s"),
                                    pDrvIns->iInstance, szLocation);
-
-#if 0
-    rc = RTPollSetAddSocket(pThis->hPollSet, pThis->hSockCtrl,
-                            RTPOLL_EVT_READ | RTPOLL_EVT_WRITE | RTPOLL_EVT_ERROR,
-                            DRVTPMEMU_POLLSET_ID_SOCKET_CTRL);
-    if (RT_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                   N_("DrvTpmEmu#%d failed to add socket for %s to poll set"),
-                                   pDrvIns->iInstance, szLocation);
-#endif
 
     rc = drvTpmEmuQueryCaps(pThis);