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

Timestamp:

May 7, 2008 11:00:06 PM (17 years ago)

Author:

vboxsync

Message:

UpdateGuestVersion fixes.

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (2 diffs)
• VMMDevInterface.cpp (modified) (5 diffs)
• include/GuestImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -323 +323 @@
 /////////////////////////////////////////////////////////////////////////////
 
-void Guest::setAdditionsVersion (Bstr aVersion)
-{
-    AssertReturnVoid (!aVersion.isEmpty());
+void Guest::setAdditionsVersion (Bstr aVersion, VBOXOSTYPE aOsType)
+{
+    Assert(aVersion.isNull() || !aVersion.isEmpty());
 
     AutoCaller autoCaller (this);
@@ -333 +333 @@
 
     mData.mAdditionsVersion = aVersion;
-    /* this implies that Additions are active */
-    mData.mAdditionsActive = TRUE;
+    mData.mAdditionsActive = !aVersion.isNull();
+    /** @todo Translate aOsType to a string and assign it to mData.mOSTypeId.
+     * The problem is just that the VBOXOSTYPE -> string translation table is in VBoxSVC. :/
+     * We need this fixed for correct session information! */
 }
 

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -151 +151 @@
 /**
  * Report guest OS version.
- * Called whenever the Additions issue a guest version report request.
+ * Called whenever the Additions issue a guest version report request or the VM is reset.
  *
  * @param   pInterface          Pointer to this interface.
@@ -171 +171 @@
         return;
 
-    char version[20];
-    RTStrPrintf(version, sizeof(version), "%d", guestInfo->additionsVersion);
-    guest->setAdditionsVersion(Bstr(version));
+    if (guestInfo->additionsVersion != 0)
+    {
+        char version[20];
+        RTStrPrintf(version, sizeof(version), "%d", guestInfo->additionsVersion);
+        guest->setAdditionsVersion(Bstr(version), guestInfo->osType);
+
+        /*
+         * Tell the console interface about the event
+         * so that it can notify its consumers.
+         */
+        pDrv->pVMMDev->getParent()->onAdditionsStateChange();
+
+        if (guestInfo->additionsVersion < VMMDEV_VERSION)
+            pDrv->pVMMDev->getParent()->onAdditionsOutdated();
+    }
+    else
+    {
+        /*
+         * The guest additions was disabled because of a reset
+         * or driver unload.
+         */
+        guest->setAdditionsVersion (Bstr(), guestInfo->osType);
+        pDrv->pVMMDev->getParent()->onAdditionsStateChange();
+    }
+}
+
+/**
+ * Update the guest additions capabilities.
+ * This is called when the guest additions capabilities change. The new capabilities
+ * are given and the connector should update its internal state.
+ *
+ * @param   pInterface          Pointer to this interface.
+ * @param   newCapabilities     New capabilities.
+ * @thread  The emulation thread.
+ */
+DECLCALLBACK(void) vmmdevUpdateGuestCapabilities(PPDMIVMMDEVCONNECTOR pInterface, uint32_t newCapabilities)
+{
+    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
+
+    /* store that information in IGuest */
+    Guest* guest = pDrv->pVMMDev->getParent()->getGuest();
+    Assert(guest);
+    if (!guest)
+        return;
+
+    guest->setSupportsSeamless(BOOL (newCapabilities & VMMDEV_GUEST_SUPPORTS_SEAMLESS));
+    guest->setSupportsGraphics(BOOL (newCapabilities & VMMDEV_GUEST_SUPPORTS_GRAPHICS));
 
     /*
@@ -180 +224 @@
      */
     pDrv->pVMMDev->getParent()->onAdditionsStateChange();
-    
-    if (guestInfo->additionsVersion < VMMDEV_VERSION)
-    {
-        pDrv->pVMMDev->getParent()->onAdditionsOutdated();
-    }
-}
-
-/**
- * Update the guest additions capabilities.
- * This is called when the guest additions capabilities change. The new capabilities
- * are given and the connector should update its internal state.
- *
- * @param   pInterface          Pointer to this interface.
- * @param   newCapabilities     New capabilities.
- * @thread  The emulation thread.
- */
-DECLCALLBACK(void) vmmdevUpdateGuestCapabilities(PPDMIVMMDEVCONNECTOR pInterface, uint32_t newCapabilities)
-{
-    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
-
-    /* store that information in IGuest */
-    Guest* guest = pDrv->pVMMDev->getParent()->getGuest();
-    Assert(guest);
-    if (!guest)
-        return;
-
-    guest->setSupportsSeamless(BOOL (newCapabilities & VMMDEV_GUEST_SUPPORTS_SEAMLESS));
-    guest->setSupportsGraphics(BOOL (newCapabilities & VMMDEV_GUEST_SUPPORTS_GRAPHICS));
-
-    /*
-     * Tell the console interface about the event
-     * so that it can notify its consumers.
-     */
-    pDrv->pVMMDev->getParent()->onAdditionsStateChange();
-    
+
 }
 
@@ -458 +468 @@
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_MEM_SYSTEM_CACHE)
         guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_MemSystemCache, pGuestStats->u32MemSystemCache / (_1M/pGuestStats->u32PageSize));
-    
+
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PAGE_FILE_SIZE)
         guest->SetStatistic(pGuestStats->u32CpuId, GuestStatisticType_PageFileSize, pGuestStats->u32PageFileSize / (_1M/pGuestStats->u32PageSize));
@@ -501 +511 @@
 
     PDRVMAINVMMDEV pDrv = PDMIHGCMCONNECTOR_2_MAINVMMDEV(pInterface);
-    
+
     if (    !pServiceLocation
         || (   pServiceLocation->type != VMMDevHGCMLoc_LocalHost

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

@@ -24 +24 @@
 
 #include "VirtualBoxBase.h"
+#include <VBox/ostypes.h>
 
 class Console;
@@ -74 +75 @@
 
     // public methods that are not in IDL
-    void setAdditionsVersion (Bstr aVersion);
+    void setAdditionsVersion (Bstr aVersion, VBOXOSTYPE aOsType);
 
     void setSupportsSeamless (BOOL aSupportsSeamless);