Changeset 29043 in vbox for trunk/src/VBox/Additions

Timestamp:

May 4, 2010 8:29:57 PM (15 years ago)

Author:

vboxsync

Message:

Additions: report VMMDevReq_ReportGuestInfo2 in addition to VMMDevReq_ReportGuestInfo

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest.cpp (modified) (2 diffs)
• freebsd/files_vboxguest (modified) (1 diff)
• linux/files_vboxguest (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -34 +34 @@
 #ifdef VBOX_WITH_HGCM
 # include <iprt/thread.h>
+#endif
+#include "version-generated.h"
+#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
+# include "revision-generated.h"
 #endif
 
@@ -273 +277 @@
         VbglGRFree(&pReq->header);
     }
+    VMMDevReportGuestInfo2 *pReq2;
+    if (RT_SUCCESS(rc))
+        rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq2, sizeof(*pReq2), VMMDevReq_ReportGuestInfo2);
+    if (RT_SUCCESS(rc))
+    {
+        pReq2->guestInfo.additionsMajor = VBOX_VERSION_MAJOR;
+        pReq2->guestInfo.additionsMinor = VBOX_VERSION_MINOR;
+        pReq2->guestInfo.additionsBuild = VBOX_VERSION_BUILD;
+        pReq2->guestInfo.additionsRevision = VBOX_SVN_REV;
+        pReq2->guestInfo.additionsFeatures = 0;
+        RTStrCopy(pReq2->guestInfo.szName, sizeof(pReq2->guestInfo.szName), VBOX_VERSION_STRING);
+        rc = VbglGRPerform(&pReq2->header);
+        if (rc == VERR_NOT_IMPLEMENTED) /* compatibility with older guests */
+            rc = VINF_SUCCESS;
+        if (    RT_FAILURE(rc)
+            ||  RT_FAILURE(pReq2->header.rc))
+            LogRel(("vboxGuestInitReportGuestInfo2: failed with rc=%Rrc and VMMDev rc=%Rrc\n",
+                    rc, pReq2->header.rc));
+        VbglGRFree(&pReq2->header);
+    }
     return rc;
 }

trunk/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest

@@ -175 +175 @@
     ${PATH_ROOT}/src/VBox/Runtime/VBox/logbackdoor.cpp=>VBox/logbackdoor.c \
     ${PATH_OUT}/version-generated.h=>version-generated.h \
+    ${PATH_OUT}/revision-generated.h=>revision-generated.h \
 "
 

trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest

@@ -142 +142 @@
     ${PATH_OUT}/version-generated.h=>version-generated.h \
     ${PATH_OUT}/product-generated.h=>product-generated.h \
+    ${PATH_OUT}/revision-generated.h=>revision-generated.h \
 "