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

Timestamp:

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

Author:

vboxsync

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

64255

Message:

Removed use of interface version for IGuest::getAdditionsVersion, some cleanup.

File:

• trunk/src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (7 diffs)

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

@@ -59 +59 @@
 #define VMMDEVSTATE_2_DEVINS(pVMMDevState)         ( (pVMMDevState)->pDevIns )
 
-#define VBOX_GUEST_ADDITIONS_VERSION_1_03(s) \
-    (   RT_HIWORD((s)->guestInfo.additionsVersion) == 1 \
-     && RT_LOWORD((s)->guestInfo.additionsVersion) == 3 )
-
-#define VBOX_GUEST_ADDITIONS_VERSION_OK(additionsVersion) \
+#define VBOX_GUEST_INTERFACE_VERSION_1_03(s) \
+    (   RT_HIWORD((s)->guestInfo.interfaceVersion) == 1 \
+     && RT_LOWORD((s)->guestInfo.interfaceVersion) == 3 )
+
+#define VBOX_GUEST_INTERFACE_VERSION_OK(additionsVersion) \
       (   RT_HIWORD(additionsVersion) == RT_HIWORD(VMMDEV_VERSION) \
        && RT_LOWORD(additionsVersion) <= RT_LOWORD(VMMDEV_VERSION) )
 
-#define VBOX_GUEST_ADDITIONS_VERSION_OLD(additionsVersion) \
+#define VBOX_GUEST_INTERFACE_VERSION_OLD(additionsVersion) \
       (   (RT_HIWORD(additionsVersion) < RT_HIWORD(VMMDEV_VERSION) \
        || (   RT_HIWORD(additionsVersion) == RT_HIWORD(VMMDEV_VERSION) \
            && RT_LOWORD(additionsVersion) <= RT_LOWORD(VMMDEV_VERSION) ) )
 
-#define VBOX_GUEST_ADDITIONS_VERSION_TOO_OLD(additionsVersion) \
+#define VBOX_GUEST_INTERFACE_VERSION_TOO_OLD(additionsVersion) \
       ( RT_HIWORD(additionsVersion) < RT_HIWORD(VMMDEV_VERSION) )
 
-#define VBOX_GUEST_ADDITIONS_VERSION_NEW(additionsVersion) \
+#define VBOX_GUEST_INTERFACE_VERSION_NEW(additionsVersion) \
       (   RT_HIWORD(additionsVersion) > RT_HIWORD(VMMDEV_VERSION) \
        || (   RT_HIWORD(additionsVersion) == RT_HIWORD(VMMDEV_VERSION) \
@@ -185 +185 @@
     Log3(("VMMDevNotifyGuest_EMT: u32EventMask = 0x%08X.\n", u32EventMask));
 
-    if (VBOX_GUEST_ADDITIONS_VERSION_1_03 (pVMMDevState))
+    if (VBOX_GUEST_INTERFACE_VERSION_1_03 (pVMMDevState))
     {
         Log3(("VMMDevNotifyGuest_EMT: Old additions detected.\n"));
@@ -487 +487 @@
 
                     /* Check additions version */
-                    pThis->fu32AdditionsOk = VBOX_GUEST_ADDITIONS_VERSION_OK(pThis->guestInfo.additionsVersion);
+                    pThis->fu32AdditionsOk = VBOX_GUEST_INTERFACE_VERSION_OK(pThis->guestInfo.interfaceVersion);
 
                     LogRel(("Guest Additions information report: Interface = 0x%08X osType = 0x%08X\n",
-                            pThis->guestInfo.additionsVersion,
+                            pThis->guestInfo.interfaceVersion,
                             pThis->guestInfo.osType));
                     pThis->pDrv->pfnUpdateGuestInfo(pThis->pDrv, &pThis->guestInfo);
@@ -516 +516 @@
             else
             {
-                VBoxGuestInfo2 *guestInfo2 = &((VMMDevReportGuestInfo2*)pRequestHeader)->guestInfo;
+                VBoxGuestInfo2 *pGuestInfo2 = &((VMMDevReportGuestInfo2*)pRequestHeader)->guestInfo;
+                AssertPtr(pGuestInfo2);
                 LogRel(("Guest Additions information report: Version %d.%d.%d r%d '%.*s'\n",
-                        guestInfo2->additionsMajor, guestInfo2->additionsMinor, guestInfo2->additionsBuild,
-                        guestInfo2->additionsRevision, sizeof(guestInfo2->szName), guestInfo2->szName));
+                        pGuestInfo2->additionsMajor, pGuestInfo2->additionsMinor, pGuestInfo2->additionsBuild,
+                        pGuestInfo2->additionsRevision, sizeof(pGuestInfo2->szName), pGuestInfo2->szName));
+                pThis->pDrv->pfnUpdateGuestInfo2(pThis->pDrv, pGuestInfo2);
                 pRequestHeader->rc = VINF_SUCCESS;
             }
@@ -1123 +1125 @@
             else
             {
-                if (VBOX_GUEST_ADDITIONS_VERSION_1_03 (pThis))
+                if (VBOX_GUEST_INTERFACE_VERSION_1_03 (pThis))
                 {
                     vmmdevSetIRQ_Legacy_EMT (pThis);
@@ -2603 +2605 @@
     {
         LogRel(("Guest Additions information report: additionsVersion = 0x%08X, osType = 0x%08X\n",
-                pThis->guestInfo.additionsVersion,
+                pThis->guestInfo.interfaceVersion,
                 pThis->guestInfo.osType));
         if (pThis->pDrv)
@@ -2692 +2694 @@
     /* Reset means that additions will report again. */
     const bool fVersionChanged = pThis->fu32AdditionsOk
-                              || pThis->guestInfo.additionsVersion
+                              || pThis->guestInfo.interfaceVersion
                               || pThis->guestInfo.osType != VBOXOSTYPE_Unknown;
     if (fVersionChanged)
         Log(("vmmdevReset: fu32AdditionsOk=%d additionsVersion=%x osType=%#x\n",
-             pThis->fu32AdditionsOk, pThis->guestInfo.additionsVersion, pThis->guestInfo.osType));
+             pThis->fu32AdditionsOk, pThis->guestInfo.interfaceVersion, pThis->guestInfo.osType));
     pThis->fu32AdditionsOk = false;
     memset (&pThis->guestInfo, 0, sizeof (pThis->guestInfo));