Changeset 24178 in vbox

Timestamp:

Oct 29, 2009 10:17:50 PM (15 years ago)

Author:

vboxsync

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

54120

Message:

ISCSIHDDCore.cpp: Fixed regression from >2TB target change - check the status and not just the iscsiCommand return value. netbsd-iscsi target hack (disabled).

File:

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

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

@@ -636 +636 @@
     unsigned int i;
 
-    LogFlow(("drvISCSITransportTcpWrite: cnRequest=%d (%s:%d)\n", cnRequest, pImage->pszHostname, pImage->uPort));
+    LogFlow(("iscsiTransportWrite: cnRequest=%d (%s:%d)\n", cnRequest, pImage->pszHostname, pImage->uPort));
     if (pImage->Socket == NIL_RTSOCKET)
     {
@@ -692 +692 @@
     }
 
-    LogFlow(("drvISCSITransportTcpWrite: returns %Rrc\n", rc));
+    LogFlow(("iscsiTransportWrite: returns %Rrc\n", rc));
     return rc;
 }
@@ -981 +981 @@
         aReqBHS[5] = RT_H2N_U32(1 << 16);   /* CID=1,reserved */
         aReqBHS[6] = RT_H2N_U32(pImage->CmdSN);
+#if 0 /** @todo This ExpStatSN hack is required to make the netbsd-iscsi target working. Could be a bug in the target,
+       * but they claim a bunch of other initiators works fine with it... Needs looking into. */
+        aReqBHS[7] = RT_H2N_U32(RT_MIN(pImage->ExpCmdSN, pImage->MaxCmdSN));
+#else
         aReqBHS[7] = RT_H2N_U32(pImage->ExpStatSN);
+#endif
         aReqBHS[8] = 0;             /* reserved */
         aReqBHS[9] = 0;             /* reserved */
@@ -2606 +2611 @@
 
     rc = iscsiCommand(pImage, &sr);
-    if (RT_SUCCESS(rc))
+    if (   RT_SUCCESS(rc)
+        && sr.status == SCSI_STATUS_OK)
     {
         pImage->cVolume = RT_BE2H_U64(*(uint64_t *)&data12[0]);