Changeset 29043 in vbox for trunk

Timestamp:

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

Author:

vboxsync

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

61089

Message:

Additions: report VMMDevReq_ReportGuestInfo2 in addition to VMMDevReq_ReportGuestInfo

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• include/VBox/VMMDev.h (modified) (5 diffs)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest (modified) (1 diff)

trunk/Config.kmk

@@ -4120 +4120 @@
 endif
 
+# only needed for VBoxGuest for Linux/FreeBSD guests
+$(PATH_OUT)/revision-generated.h: $(VBOX_SVN_REV_KMK)
+        $(call MSG_GENERATE,,$@)
+        $(QUIET)$(RM) -f $@ [email protected]
+        $(QUIET)$(MKDIR) -p $(@D)
+        $(QUIET)$(APPEND) [email protected] '#define VBOX_SVN_REV $(VBOX_SVN_REV)'
+        $(QUIET)$(MV) -f [email protected] $@
+
 #
 # Shared definitions of the XIDL file to use as a source for

trunk/include/VBox/VMMDev.h

@@ -131 +131 @@
     VMMDevReq_GetHypervisorInfo          = 20,
     VMMDevReq_SetHypervisorInfo          = 21,
-    VMMDevReq_RegisterPatchMemory             = 22,
-    VMMDevReq_DeregisterPatchMemory           = 23,
+    VMMDevReq_RegisterPatchMemory        = 22, /* since version 3.0.6 */
+    VMMDevReq_DeregisterPatchMemory      = 23, /* since version 3.0.6 */
     VMMDevReq_SetPowerStatus             = 30,
     VMMDevReq_AcknowledgeEvents          = 41,
     VMMDevReq_CtlGuestFilterMask         = 42,
     VMMDevReq_ReportGuestInfo            = 50,
+    VMMDevReq_ReportGuestInfo2           = 58, /* since version 3.2.0 */
     VMMDevReq_GetDisplayChangeRequest    = 51,
     VMMDevReq_VideoModeSupported         = 52,
@@ -143 +144 @@
     VMMDevReq_ReportGuestCapabilities    = 55,
     VMMDevReq_SetGuestCapabilities       = 56,
-    VMMDevReq_VideoModeSupported2        = 57,
+    VMMDevReq_VideoModeSupported2        = 57, /* since version 3.2.0 */
 #ifdef VBOX_WITH_HGCM
     VMMDevReq_HGCMConnect                = 60,
@@ -625 +626 @@
     /** Feature mask, currently unused. */
     uint32_t additionsFeatures;
+    /** some additional information, for example 'Beta 1' or something like that */
+    char     szName[128];
 } VBoxGuestInfo2;
 
@@ -640 +643 @@
     VBoxGuestInfo2 guestInfo;
 } VMMDevReportGuestInfo2;
-AssertCompileSize(VMMDevReportGuestInfo2, 24+16);
+AssertCompileSize(VMMDevReportGuestInfo2, 24+144);
 
 
@@ -1609 +1612 @@
         case VMMDevReq_ReportGuestInfo:
             return sizeof(VMMDevReportGuestInfo);
+        case VMMDevReq_ReportGuestInfo2:
+            return sizeof(VMMDevReportGuestInfo2);
         case VMMDevReq_GetDisplayChangeRequest:
             return sizeof(VMMDevDisplayChangeRequest);

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 \
 "