Changeset 104640 in vbox for trunk/src/VBox/Main/include

Timestamp:

May 15, 2024 1:16:55 PM (9 months ago)

Author:

vboxsync

Message:

Main/Guest Additions Auto Update: Implemented support for logging guest process output to the release log. That way it will be much easier to diagnose what's happening on the guest side while updating.

Location:

trunk/src/VBox/Main/include

Files:

• GuestProcessImpl.h (modified) (1 diff)
• GuestSessionImplTasks.h (modified) (1 diff)

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

@@ -248 +248 @@
     int terminate(uint32_t uTimeoutMS, int *pvrcGuest);
 
+    int wait(int *pvrcGuest);
+
+public:
+
+    virtual int onOutputCallback(uint32_t uHandle, const std::vector<Utf8Str> &vecData);
+
+    virtual int onOutputCallback(uint32_t uHandle, const BYTE *pbData, size_t cbData);
+
+    virtual int onInputCallback(uint32_t uHandle, std::vector<Utf8Str> &vecData);
+
 protected:
 

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

@@ -354 +354 @@
 
 /**
+ * Implementation for a Guest Additions update process for logging process output to the release log.
+ */
+class UpdateAdditionsProcess : public GuestProcessWrapper
+{
+public:
+
+    UpdateAdditionsProcess(void) { }
+
+    virtual ~UpdateAdditionsProcess();
+
+    int onOutputCallback(uint32_t uHandle, const BYTE *pbData, size_t cbData);
+
+protected:
+
+    /** Current line of stdout. */
+    Utf8Str mLineStdOut;
+    /** Current line of stderr. */
+    Utf8Str mLineStdErr;
+};
+
+/**
+ * Tweaked startup info for a guest Guest Additions update process.
+ */
+class UpdateAdditionsStartupInfo : public GuestProcessStartupInfo
+{
+public:
+
+    UpdateAdditionsStartupInfo(void)
+    {
+        /* We want to have stdout / stderr handled by default for update processes. */
+        mFlags = ProcessCreateFlag_WaitForStdOut | ProcessCreateFlag_WaitForStdErr;
+    }
+};
+
+/**
  * Guest session task for automatically updating the Guest Additions on the guest.
  */