Changeset 89761 in vbox

Timestamp:

Jun 17, 2021 9:11:54 AM (3 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Change the ATS command line parameters to be the same for test and self-test. bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (1 diff)
• vkatCmdSelfTest.cpp (modified) (3 diffs)

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

@@ -161 +161 @@
     { "--exclude",           'e',                          RTGETOPT_REQ_UINT32  },
     { "--exclude-all",       'a',                          RTGETOPT_REQ_NOTHING },
-    { "--guest-ats-address", VKAT_TEST_OPT_GUEST_ATS_ADDR, RTGETOPT_REQ_STRING  },
+    { "--guest-ats-addr",    VKAT_TEST_OPT_GUEST_ATS_ADDR, RTGETOPT_REQ_STRING  },
     { "--guest-ats-port",    VKAT_TEST_OPT_GUEST_ATS_PORT, RTGETOPT_REQ_UINT32  },
     { "--host-ats-address",  VKAT_TEST_OPT_HOST_ATS_ADDR,  RTGETOPT_REQ_STRING  },

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

@@ -215 +215 @@
 enum
 {
-    VKAT_SELFTEST_OPT_ATS_GUEST_ADDR = 900,
-    VKAT_SELFTEST_OPT_ATS_GUEST_PORT,
-    VKAT_SELFTEST_OPT_ATS_VALKIT_ADDR,
-    VKAT_SELFTEST_OPT_ATS_VALKIT_PORT
+    VKAT_SELFTEST_OPT_GUEST_ATS_ADDR = 900,
+    VKAT_SELFTEST_OPT_GUEST_ATS_PORT,
+    VKAT_SELFTEST_OPT_HOST_ATS_ADDR,
+    VKAT_SELFTEST_OPT_HOST_ATS_PORT
 };
 
@@ -226 +226 @@
 static const RTGETOPTDEF s_aCmdSelftestOptions[] =
 {
-    { "--ats-guest-addr",   VKAT_SELFTEST_OPT_ATS_GUEST_ADDR,   RTGETOPT_REQ_STRING  },
-    { "--ats-guest-port",   VKAT_SELFTEST_OPT_ATS_GUEST_PORT,   RTGETOPT_REQ_UINT32  },
-    { "--ats-valkit-addr",  VKAT_SELFTEST_OPT_ATS_GUEST_ADDR,   RTGETOPT_REQ_STRING  },
-    { "--ats-valkit-port",  VKAT_SELFTEST_OPT_ATS_GUEST_PORT,   RTGETOPT_REQ_UINT32  },
+    { "--guest-ats-addr",   VKAT_SELFTEST_OPT_GUEST_ATS_ADDR,   RTGETOPT_REQ_STRING  },
+    { "--guest-ats-port",   VKAT_SELFTEST_OPT_GUEST_ATS_PORT,   RTGETOPT_REQ_UINT32  },
+    { "--host-ats-addr",    VKAT_SELFTEST_OPT_HOST_ATS_ADDR,    RTGETOPT_REQ_STRING  },
+    { "--host-ats-port",    VKAT_SELFTEST_OPT_HOST_ATS_PORT,    RTGETOPT_REQ_UINT32  },
     { "--exclude-all",      'a',                                RTGETOPT_REQ_NOTHING },
     { "--backend",          'b',                                RTGETOPT_REQ_STRING  },
@@ -269 +269 @@
         switch (rc)
         {
-            case VKAT_SELFTEST_OPT_ATS_GUEST_ADDR:
+            case VKAT_SELFTEST_OPT_GUEST_ATS_ADDR:
                 rc = RTStrCopy(Ctx.Host.szGuestAtsAddr, sizeof(Ctx.Host.szGuestAtsAddr), ValueUnion.psz);
                 break;
 
-            case VKAT_SELFTEST_OPT_ATS_GUEST_PORT:
+            case VKAT_SELFTEST_OPT_GUEST_ATS_PORT:
                 Ctx.Host.uGuestAtsPort = ValueUnion.u32;
                 break;
 
-            case VKAT_SELFTEST_OPT_ATS_VALKIT_ADDR:
+            case VKAT_SELFTEST_OPT_HOST_ATS_ADDR:
                 rc = RTStrCopy(Ctx.Host.szValKitAtsAddr, sizeof(Ctx.Host.szValKitAtsAddr), ValueUnion.psz);
                 break;
 
-            case VKAT_SELFTEST_OPT_ATS_VALKIT_PORT:
+            case VKAT_SELFTEST_OPT_HOST_ATS_PORT:
                 Ctx.Host.uValKitAtsPort = ValueUnion.u32;
                 break;