Changeset 32983 in vbox for trunk/src/VBox/Devices/Storage/VBoxSCSI.cpp

Timestamp:

Oct 7, 2010 3:14:54 PM (15 years ago)

Author:

vboxsync

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

66493

Message:

LsiLogic: Suspend the VM on a recoverable error without changing the saved state format

File:

• trunk/src/VBox/Devices/Storage/VBoxSCSI.cpp (modified) (4 diffs)

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

@@ -271 +271 @@
     if (pVBoxSCSI->uTxDir == VBOXSCSI_TXDIR_FROM_DEVICE)
     {
-        Assert(!pVBoxSCSI->pBuf);
+        if (pVBoxSCSI->pBuf)
+            RTMemFree(pVBoxSCSI->pBuf);
+
         pVBoxSCSI->pBuf = (uint8_t *)RTMemAllocZ(pVBoxSCSI->cbBuf);
         if (!pVBoxSCSI->pBuf)
@@ -277 +279 @@
     }
 
-    /** Allocate scatter gather element. */
+    /* Allocate scatter gather element. */
     pScsiRequest->paScatterGatherHead = (PRTSGSEG)RTMemAllocZ(sizeof(RTSGSEG) * 1); /* Only one element. */
     if (!pScsiRequest->paScatterGatherHead)
@@ -286 +288 @@
     }
 
-    /** Allocate sense buffer. */
+    /* Allocate sense buffer. */
     pScsiRequest->cbSenseBuffer = 18;
     pScsiRequest->pbSenseBuffer = (uint8_t *)RTMemAllocZ(pScsiRequest->cbSenseBuffer);
@@ -385 +387 @@
 }
 
+void vboxscsiSetRequestRedo(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest)
+{
+    AssertMsg(pVBoxSCSI->fBusy, ("No request to redo\n"));
+
+    RTMemFree(pScsiRequest->paScatterGatherHead);
+    RTMemFree(pScsiRequest->pbSenseBuffer);
+
+    if (pVBoxSCSI->uTxDir == VBOXSCSI_TXDIR_FROM_DEVICE)
+    {
+        AssertPtr(pVBoxSCSI->pBuf);
+    }
+}
+