Changeset 99416 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 17, 2023 9:14:22 AM (21 months ago)

Author:

vboxsync

Message:

Guest Control/Main: Treat reported Guest Additions versions of "0.0.0" (or 0) through VMMDev as Guest Additions not being found or not ready (yet) within GuestSession::i_determineProtocolVersion() (via vmmdevUpdateGuestInfo[2]).

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (1 diff)
• src-client/GuestCtrlImpl.cpp (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (3 diffs)

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

@@ -428 +428 @@
         SessionObjects              mObjects;
         /** Guest control protocol version to be used.
-         *  Guest Additions < VBox 4.3 have version 1,
-         *  any newer version will have version 2. */
+         * Guest Additions < VBox 4.3 have version 1, any newer version will have version 2.
+         * Set to 0 if a valid Guest Additions version was not found (yet). */
         uint32_t                    mProtocolVersion;
         /** Session timeout (in ms). */

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

@@ -459 +459 @@
                 break;
 
-            /** @todo Add more errors here. */
+            case VERR_NOT_FOUND: /* Returned by i_sessionCreate(). */
+                hrc = setErrorBoth(VBOX_E_GSTCTL_GUEST_ERROR, vrc, tr("Guest Additions are not installed or not ready (yet)"));
+                break;
 
             default:
-                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not create guest session: %Rrc"), vrc);
+                hrc = setErrorBoth(VBOX_E_GSTCTL_GUEST_ERROR, vrc, tr("Could not create guest session: %Rrc"), vrc);
                 break;
         }

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

@@ -200 +200 @@
  *
  * @returns VBox status code.
+ * @retval  VERR_NOT_FOUND if the Guest Additions were not found (or were not reported yet).
  * @param   pGuest              Guest object the guest session belongs to.
  * @param   ssInfo              Guest session startup info to use.
@@ -3535 +3536 @@
  * Determines the protocol version (sets mData.mProtocolVersion).
  *
- * This is called from the init method prior to to establishing a guest
- * session.
+ * This is called from the init method prior to to establishing a guest session.
  *
  * @returns VBox status code.
+ * @retval  VERR_NOT_FOUND if the Guest Additions were not found (or were not reported) yet.
  */
 int GuestSession::i_determineProtocolVersion(void)
@@ -3549 +3550 @@
     AssertReturn(!pGuest.isNull(), VERR_NOT_SUPPORTED);
     uint32_t uGaVersion = pGuest->i_getAdditionsVersion();
+    if (!uGaVersion) /* If 0, there was no Guest Additions version detected (yet), or the VM is in reset state. */
+        return VERR_NOT_FOUND;
 
     /* Everyone supports version one, if they support anything at all. */