Changeset 107966 in vbox

Timestamp:

Jan 28, 2025 3:01:40 PM (3 weeks ago)

Author:

vboxsync

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

167216

Message:

Main: Added optional file support to GuestSessionTaskUpdateAdditions::runFileOnGuest(). Prerequisite for adding the ARM64-based Guest Additions installer. bugref:10734

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImplTasks.h (modified) (1 diff)
• src-client/GuestSessionImplTasks.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/GuestSessionImplTasks.h

@@ -457 +457 @@
     int addProcessArguments(ProcessArguments &aArgumentsDest, const ProcessArguments &aArgumentsSource);
     int copyFileToGuest(GuestSession *pSession, RTVFS hVfsIso, Utf8Str const &strFileSource, const Utf8Str &strFileDest, bool fOptional);
-    int runFileOnGuest(GuestSession *pSession, GuestProcessStartupInfo &procInfo, bool fSilent = false);
+    int runFileOnGuest(GuestSession *pSession, GuestProcessStartupInfo &procInfo, bool fSilent = false, bool fOptional = false);
     HRESULT setUpdateErrorMsg(HRESULT hrc, const Utf8Str &strMsg);
     HRESULT setUpdateErrorMsg(HRESULT hrc, const Utf8Str &strMsg, const GuestErrorInfo &guestErrorInfo);

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

@@ -2717 +2717 @@
  * @param   pSession            Guest session to use.
  * @param   procInfo            Guest process startup info to use.
- * @param   fSilent             Whether to set progress into failure state in case of error.
+ * @param   fSilent             Whether to set progress into failure state in case of error. Defaults to \c false.
+ *                              Overrides \a fOptional.
+ * @param   fOptional           Whether the file to run is optional, i.e. can be missing (also its path).
+ *                              When set to \c false (non-optional), this will trigger an error if the file cannot be found.
+ *                              Defaults to \c false.
  */
-int GuestSessionTaskUpdateAdditions::runFileOnGuest(GuestSession *pSession, GuestProcessStartupInfo &procInfo, bool fSilent)
+int GuestSessionTaskUpdateAdditions::runFileOnGuest(GuestSession *pSession, GuestProcessStartupInfo &procInfo,
+                                                    bool fSilent /* = false */, bool fOptional /* = false */)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -2772 +2777 @@
 
             }
+
             case VERR_GSTCTL_GUEST_ERROR:
+            {
+                if (   (   vrcGuest == VERR_FILE_NOT_FOUND
+                        || vrcGuest == VERR_PATH_NOT_FOUND)
+                    && fOptional)
+                {
+                    LogRel(("Guest Additions Update: File \"%s\" is absent, skipping\n", procInfo.mName.c_str()));
+                    vrc = VINF_SUCCESS;
+                    break;
+                }
+
                 setUpdateErrorMsg(VBOX_E_GSTCTL_GUEST_ERROR, tr("Running update file on guest failed"),
                                   GuestErrorInfo(GuestErrorInfo::Type_Process, vrcGuest, cmdLine.c_str()));
                 break;
+            }
 
             case VERR_INVALID_STATE: /** @todo Special guest control vrc needed! */