Changeset 91882 in vbox

Timestamp:

Oct 20, 2021 11:41:52 AM (3 years ago)

Author:

vboxsync

Message:

Devices/Storage: Change the USB mass storage device emulations to access the CFGM and SSM API through the USB helper callback table only, bugref:10074

File:

• trunk/src/VBox/Devices/Storage/UsbMsd.cpp (modified) (13 diffs)

trunk/src/VBox/Devices/Storage/UsbMsd.cpp

@@ -1348 +1348 @@
 {
     RT_NOREF(uPass);
-    PUSBMSD pThis = PDMINS_2_DATA(pUsbIns, PUSBMSD);
+    PUSBMSD     pThis = PDMINS_2_DATA(pUsbIns, PUSBMSD);
+    PCPDMUSBHLP pHlp  = pUsbIns->pHlpR3;
 
     /* config. */
-    SSMR3PutBool(pSSM, pThis->Lun0.pIBase != NULL);
+    pHlp->pfnSSMPutBool(pSSM, pThis->Lun0.pIBase != NULL);
     return VINF_SSM_DONT_CALL_AGAIN;
 }
@@ -1360 +1361 @@
 static DECLCALLBACK(int) usbMsdSaveExec(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM)
 {
-    PUSBMSD pThis = PDMINS_2_DATA(pUsbIns, PUSBMSD);
-    int rc;
+    PUSBMSD     pThis = PDMINS_2_DATA(pUsbIns, PUSBMSD);
+    PCPDMUSBHLP pHlp  = pUsbIns->pHlpR3;
 
     /* The config */
-    rc = usbMsdLiveExec(pUsbIns, pSSM, SSM_PASS_FINAL);
+    int rc = usbMsdLiveExec(pUsbIns, pSSM, SSM_PASS_FINAL);
     AssertRCReturn(rc, rc);
 
-    SSMR3PutU8(pSSM, pThis->bConfigurationValue);
-    SSMR3PutBool(pSSM, pThis->aEps[0].fHalted);
-    SSMR3PutBool(pSSM, pThis->aEps[1].fHalted);
-    SSMR3PutBool(pSSM, pThis->aEps[2].fHalted);
-    SSMR3PutBool(pSSM, pThis->pReq != NULL);
+    pHlp->pfnSSMPutU8(pSSM, pThis->bConfigurationValue);
+    pHlp->pfnSSMPutBool(pSSM, pThis->aEps[0].fHalted);
+    pHlp->pfnSSMPutBool(pSSM, pThis->aEps[1].fHalted);
+    pHlp->pfnSSMPutBool(pSSM, pThis->aEps[2].fHalted);
+    pHlp->pfnSSMPutBool(pSSM, pThis->pReq != NULL);
 
     if (pThis->pReq)
@@ -1377 +1378 @@
         PUSBMSDREQ pReq = pThis->pReq;
 
-        SSMR3PutU32(pSSM, pReq->enmState);
-        SSMR3PutU32(pSSM, pReq->cbBuf);
+        pHlp->pfnSSMPutU32(pSSM, pReq->enmState);
+        pHlp->pfnSSMPutU32(pSSM, pReq->cbBuf);
         if (pReq->cbBuf)
         {
             AssertPtr(pReq->pbBuf);
-            SSMR3PutMem(pSSM, pReq->pbBuf, pReq->cbBuf);
+            pHlp->pfnSSMPutMem(pSSM, pReq->pbBuf, pReq->cbBuf);
         }
 
-        SSMR3PutU32(pSSM, pReq->offBuf);
-        SSMR3PutMem(pSSM, &pReq->Cbw, sizeof(pReq->Cbw));
-        SSMR3PutU8(pSSM, pReq->iScsiReqStatus);
-    }
-
-    return SSMR3PutU32(pSSM, UINT32_MAX); /* sanity/terminator */
+        pHlp->pfnSSMPutU32(pSSM, pReq->offBuf);
+        pHlp->pfnSSMPutMem(pSSM, &pReq->Cbw, sizeof(pReq->Cbw));
+        pHlp->pfnSSMPutU8(pSSM, pReq->iScsiReqStatus);
+    }
+
+    return pHlp->pfnSSMPutU32(pSSM, UINT32_MAX); /* sanity/terminator */
 }
 
@@ -1398 +1399 @@
 static DECLCALLBACK(int) usbMsdLoadExec(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    PUSBMSD pThis = PDMINS_2_DATA(pUsbIns, PUSBMSD);
-    uint32_t u32;
-    int rc;
+    PUSBMSD     pThis = PDMINS_2_DATA(pUsbIns, PUSBMSD);
+    PCPDMUSBHLP pHlp  = pUsbIns->pHlpR3;
 
     if (uVersion > USB_MSD_SAVED_STATE_VERSION)
@@ -1407 +1407 @@
     /* Verify config. */
     bool fInUse;
-    rc = SSMR3GetBool(pSSM, &fInUse);
+    int rc = pHlp->pfnSSMGetBool(pSSM, &fInUse);
     AssertRCReturn(rc, rc);
     if (fInUse != (pThis->Lun0.pIBase != NULL))
-        return SSMR3SetCfgError(pSSM, RT_SRC_POS,
-                                N_("The %s VM is missing a USB mass storage device. Please make sure the source and target VMs have compatible storage configurations"),
-                                fInUse ? "target" : "source");
+        return pHlp->pfnSSMSetCfgError(pSSM, RT_SRC_POS,
+                                       N_("The %s VM is missing a USB mass storage device. Please make sure the source and target VMs have compatible storage configurations"),
+                                       fInUse ? "target" : "source");
 
     if (uPass == SSM_PASS_FINAL)
@@ -1419 +1419 @@
         Assert(!pThis->pReq);
 
-        SSMR3GetU8(pSSM, &pThis->bConfigurationValue);
-        SSMR3GetBool(pSSM, &pThis->aEps[0].fHalted);
-        SSMR3GetBool(pSSM, &pThis->aEps[1].fHalted);
-        SSMR3GetBool(pSSM, &pThis->aEps[2].fHalted);
+        pHlp->pfnSSMGetU8(pSSM, &pThis->bConfigurationValue);
+        pHlp->pfnSSMGetBool(pSSM, &pThis->aEps[0].fHalted);
+        pHlp->pfnSSMGetBool(pSSM, &pThis->aEps[1].fHalted);
+        pHlp->pfnSSMGetBool(pSSM, &pThis->aEps[2].fHalted);
         bool fReqAlloc = false;
-        rc = SSMR3GetBool(pSSM, &fReqAlloc);
+        rc = pHlp->pfnSSMGetBool(pSSM, &fReqAlloc);
         AssertRCReturn(rc, rc);
         if (fReqAlloc)
@@ -1433 +1433 @@
 
             AssertCompile(sizeof(pReq->enmState) == sizeof(uint32_t));
-            SSMR3GetU32(pSSM, (uint32_t *)&pReq->enmState);
+            pHlp->pfnSSMGetU32(pSSM, (uint32_t *)&pReq->enmState);
 
             uint32_t cbBuf = 0;
-            rc = SSMR3GetU32(pSSM, &cbBuf);
+            rc = pHlp->pfnSSMGetU32(pSSM, &cbBuf);
             AssertRCReturn(rc, rc);
             if (cbBuf)
@@ -1444 +1444 @@
                     AssertPtr(pReq->pbBuf);
                     Assert(cbBuf == pReq->cbBuf);
-                    SSMR3GetMem(pSSM, pReq->pbBuf, pReq->cbBuf);
+                    pHlp->pfnSSMGetMem(pSSM, pReq->pbBuf, pReq->cbBuf);
                 }
                 else
@@ -1450 +1450 @@
             }
 
-            SSMR3GetU32(pSSM, &pReq->offBuf);
-            SSMR3GetMem(pSSM, &pReq->Cbw, sizeof(pReq->Cbw));
+            pHlp->pfnSSMGetU32(pSSM, &pReq->offBuf);
+            pHlp->pfnSSMGetMem(pSSM, &pReq->Cbw, sizeof(pReq->Cbw));
 
             if (uVersion > USB_MSD_SAVED_STATE_VERSION_PRE_CLEANUP)
-                rc = SSMR3GetU8(pSSM, &pReq->iScsiReqStatus);
+                rc = pHlp->pfnSSMGetU8(pSSM, &pReq->iScsiReqStatus);
             else
             {
@@ -1460 +1460 @@
 
                 /* Skip old fields which are unused now or can be determined from the CBW. */
-                SSMR3Skip(pSSM, 4 * 4 + 64);
-                rc = SSMR3GetS32(pSSM, &iScsiReqStatus);
+                pHlp->pfnSSMSkip(pSSM, 4 * 4 + 64);
+                rc = pHlp->pfnSSMGetS32(pSSM, &iScsiReqStatus);
                 pReq->iScsiReqStatus = (uint8_t)iScsiReqStatus;
             }
@@ -1467 +1467 @@
         }
 
-        rc = SSMR3GetU32(pSSM, &u32);
+        uint32_t u32;
+        rc = pHlp->pfnSSMGetU32(pSSM, &u32);
         AssertRCReturn(rc, rc);
         AssertMsgReturn(u32 == UINT32_MAX, ("%#x\n", u32), VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
@@ -2255 +2256 @@
     RT_NOREF(pCfgGlobal);
     PDMUSB_CHECK_VERSIONS_RETURN(pUsbIns);
-    PUSBMSD pThis = PDMINS_2_DATA(pUsbIns, PUSBMSD);
+    PUSBMSD     pThis = PDMINS_2_DATA(pUsbIns, PUSBMSD);
+    PCPDMUSBHLP pHlp  = pUsbIns->pHlpR3;
+
     Log(("usbMsdConstruct/#%u:\n", iInstance));
 
@@ -2288 +2291 @@
      * Validate and read the configuration.
      */
-    rc = CFGMR3ValidateConfig(pCfg, "/", "", "", "UsbMsd", iInstance);
+    rc = pHlp->pfnCFGMValidateConfig(pCfg, "/", "", "", "UsbMsd", iInstance);
     if (RT_FAILURE(rc))
         return rc;