Changeset 72096 in vbox

Timestamp:

May 3, 2018 3:29:15 PM (7 years ago)

Author:

vboxsync

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

122488

Message:

Guest Control/Main: Also try to return guest error (if available) in GuestFile::i_readData(), GuestFile::i_readDataAt(), GuestFile::i_seekAt() and GuestFile::i_writeDataAt().

File:

• trunk/src/VBox/Main/src-client/GuestFileImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -797 +797 @@
                 *pcbRead = cbRead;
         }
+        else if (pEvent->HasGuestError()) /* Return guest rc if available. */
+        {
+            vrc = pEvent->GetGuestError();
+        }
     }
 
@@ -853 +857 @@
             if (pcbRead)
                 *pcbRead = cbRead;
+        }
+        else if (pEvent->HasGuestError()) /* Return guest rc if available. */
+        {
+            vrc = pEvent->GetGuestError();
         }
     }
@@ -902 +910 @@
     vrc = sendCommand(HOST_FILE_SEEK, i, paParms);
     if (RT_SUCCESS(vrc))
-        vrc = i_waitForOffsetChange(pEvent, uTimeoutMS, puOffset);
+    {
+        uint64_t uOffset;
+        vrc = i_waitForOffsetChange(pEvent, uTimeoutMS, &uOffset);
+        if (RT_SUCCESS(vrc))
+        {
+            LogFlowThisFunc(("uOffset=%RU64\n", uOffset));
+
+            if (puOffset)
+                *puOffset = uOffset;
+        }
+        else if (pEvent->HasGuestError()) /* Return guest rc if available. */
+        {
+            vrc = pEvent->GetGuestError();
+        }
+    }
 
     unregisterWaitEvent(pEvent);
@@ -1225 +1247 @@
                 *pcbWritten = cbWritten;
         }
+        else if (pEvent->HasGuestError()) /* Return guest rc if available. */
+        {
+            vrc = pEvent->GetGuestError();
+        }
     }