Changeset 30758 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Jul 9, 2010 12:30:12 PM (15 years ago)

Author:

vboxsync

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

63541

Message:

More fine grained Guest Additions status; now marks Additions as active when VBoxService was started successfully.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (6 diffs)
• VMMDevState.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -472 +472 @@
         case VMMDevReq_ReportGuestInfo:
         {
-            if (pRequestHeader->size < sizeof(VMMDevReportGuestInfo))
+            if (pRequestHeader->size != sizeof(VMMDevReportGuestInfo))
             {
                 AssertMsgFailed(("VMMDev guest information structure has an invalid size!\n"));
@@ -492 +492 @@
                             pThis->guestInfo.additionsVersion,
                             pThis->guestInfo.osType));
-                    pThis->pDrv->pfnUpdateGuestVersion(pThis->pDrv, &pThis->guestInfo);
+                    pThis->pDrv->pfnUpdateGuestInfo(pThis->pDrv, &pThis->guestInfo);
                 }
 
@@ -509 +509 @@
         case VMMDevReq_ReportGuestInfo2:
         {
-            if (pRequestHeader->size < sizeof(VMMDevReportGuestInfo2))
+            if (pRequestHeader->size != sizeof(VMMDevReportGuestInfo2))
             {
                 AssertMsgFailed(("VMMDev guest information 2 structure has an invalid size!\n"));
@@ -520 +520 @@
                         guestInfo2->additionsMajor, guestInfo2->additionsMinor, guestInfo2->additionsBuild,
                         guestInfo2->additionsRevision, sizeof(guestInfo2->szName), guestInfo2->szName));
+                pRequestHeader->rc = VINF_SUCCESS;
+            }
+            break;
+        }
+
+        case VMMDevReq_ReportGuestStatus:
+        {
+            if (pRequestHeader->size != sizeof(VMMDevReportGuestStatus))
+            {
+                AssertMsgFailed(("VMMDev guest status structure has an invalid size!\n"));
+                pRequestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                VBoxGuestStatus *guestStatus = &((VMMDevReportGuestStatus*)pRequestHeader)->guestStatus;
+                pThis->pDrv->pfnUpdateGuestStatus(pThis->pDrv, guestStatus);
+
                 pRequestHeader->rc = VINF_SUCCESS;
             }
@@ -2589 +2606 @@
                 pThis->guestInfo.osType));
         if (pThis->pDrv)
-            pThis->pDrv->pfnUpdateGuestVersion(pThis->pDrv, &pThis->guestInfo);
+            pThis->pDrv->pfnUpdateGuestInfo(pThis->pDrv, &pThis->guestInfo);
     }
     if (pThis->pDrv)
@@ -2726 +2743 @@
      */
     if (fVersionChanged)
-        pThis->pDrv->pfnUpdateGuestVersion(pThis->pDrv, &pThis->guestInfo);
+        pThis->pDrv->pfnUpdateGuestInfo(pThis->pDrv, &pThis->guestInfo);
     if (fCapsChanged)
         pThis->pDrv->pfnUpdateGuestCapabilities(pThis->pDrv, pThis->guestCaps);

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -127 +127 @@
     VBoxGuestInfo guestInfo;
 
-    /** Information reported by guest via VMMDevReportGuestCapabilities
-     */
+    /** Information reported by guest via VMMDevReportGuestCapabilities. */
     uint32_t      guestCaps;