Changeset 89804 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Jun 21, 2021 6:24:13 AM (4 years ago)

Author:

vboxsync

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

145261

Message:

Audio/ValKit: Fixes for running on the VBoxAudioTest on guests (needs to bind the ATS server address to 0.0.0.0 / ::0). bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkatCmdSelfTest.cpp (modified) (1 diff)
• vkatCommon.cpp (modified) (5 diffs)

trunk/src/VBox/ValidationKit/utils/audio/vkatCmdSelfTest.cpp

@@ -259 +259 @@
     RT_ZERO(Ctx);
 
-    /* Go with the platform's default bakcend if nothing else is specified. */
+    /* Go with the platform's default backend if nothing else is specified. */
     Ctx.Guest.pDrvReg = AudioTestGetDefaultBackend();
 

trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp

@@ -618 +618 @@
  *                              If 0, ATS_TCP_HOST_DEFAULT_PORT will be used.
  * @param   pszGuestTcpAddr     Guest ATS TCP/IP address to connect to.
- *                              If NULL, localhost (127.0.0.1) will be used.
+ *                              If NULL, any address (0.0.0.0) will be used.
  * @param   uGuestTcpPort       Guest ATS TCP/IP port to connect to.
  *                              If 0, ATS_TCP_GUEST_DEFAULT_PORT will be used.
@@ -650 +650 @@
     }
 
-    if (pDrvReg == NULL)
-    {
-        if (pTstEnv->fSelftest)
-            pDrvReg = &g_DrvHostValidationKitAudio;
-        else /* Go with the platform's default backend if nothing else is set. */
-            pDrvReg = AudioTestGetDefaultBackend();
-    }
+    /* Go with the platform's default backend if nothing else is set. */
+    if (!pDrvReg)
+        pDrvReg = AudioTestGetDefaultBackend();
 
     if (!uHostTcpPort)
@@ -664 +660 @@
         uGuestTcpPort = ATS_TCP_GUEST_DEFAULT_PORT;
 
-    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Test mode is '%s'\n", pTstEnv->enmMode == AUDIOTESTMODE_HOST ? "host" : "guest");
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Initializing environment for mode '%s'\n", pTstEnv->enmMode == AUDIOTESTMODE_HOST ? "host" : "guest");
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Using backend '%s'\n", pDrvReg->szName);
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Using tag '%s'\n", pTstEnv->szTag);
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Output directory is '%s'\n", pTstEnv->szPathOut);
@@ -675 +672 @@
     pTstEnv->cMsSchedulingHint = RTRandU32Ex(10, 80); /* Choose a random scheduling (in ms). */
 
-    /* Only the guest mode needs initializing the driver stack. */
-    const bool fUseDriverStack = pTstEnv->enmMode == AUDIOTESTMODE_GUEST;
+    bool fUseDriverStack = false; /* Whether to init + use the audio driver stack or not. */
+
+    /* In regular testing mode only the guest mode needs initializing the driver stack. */
+    if (pTstEnv->enmMode == AUDIOTESTMODE_GUEST)
+        fUseDriverStack = true;
+
+    /* When running in self-test mode, the host mode also needs to initialize the stack in order to
+     * to run the Valdation Kit audio driver ATS (no "real" VBox involved). */
+    if (pTstEnv->enmMode == AUDIOTESTMODE_HOST && pTstEnv->fSelftest)
+        fUseDriverStack = true;
+
     if (fUseDriverStack)
     {
@@ -727 +733 @@
          * That service then will perform playback and recording operations on the guest, triggered from the host.
          *
-         * When running this in self-test mode, that service also will be run on the host.
+         * When running this in self-test mode, that service also can be run on the host if nothing else is specified.
+         * Note that we have to bind to "0.0.0.0" by default so that the host can connect to it.
          */
         RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Starting guest ATS at %s:%RU32...\n",
-                     (pszGuestTcpAddr && *pszGuestTcpAddr) ? pszGuestTcpAddr : "127.0.0.1",
-                     uGuestTcpPort ? uGuestTcpPort : ATS_TCP_GUEST_DEFAULT_PORT);
-        rc = AudioTestSvcInit(&pTstEnv->u.Guest.Srv, pszGuestTcpAddr, uGuestTcpPort, &Callbacks);
+                     (pszGuestTcpAddr && *pszGuestTcpAddr) ? pszGuestTcpAddr : "0.0.0.0", uGuestTcpPort);
+        rc = AudioTestSvcInit(&pTstEnv->u.Guest.Srv,
+                              (pszGuestTcpAddr && *pszGuestTcpAddr) ? pszGuestTcpAddr : "0.0.0.0", uGuestTcpPort, &Callbacks);
         if (RT_SUCCESS(rc))
             rc = AudioTestSvcStart(&pTstEnv->u.Guest.Srv);