Changeset 39882 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 26, 2012 12:54:50 AM (13 years ago)

Author:

vboxsync

Message:

Config.kmk,VMMDev,Main,QtGui,VBoxManage: Refactored IGuest::additionsVersion and associated acts, splitting it up into additionsVersion and additionsRevision like IVirtualBox and IExtPack handles versioning. Fixed missing saved state in VMMDev where the VMMDevReq_ReportGuestInfo2 info was not saved and Main+Frontends led to believe we were running guest additions older than 3.2. The changes have be subjected to limited testing. Added TODOs for another missing save in VMMDev.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• VirtualBox/src/VBoxVMInformationDlg.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -2193 +2193 @@
                 && !guestString.isEmpty())
             {
+                ULONG uRevision;
+                rc = guest->COMGETTER(AdditionsRevision)(&uRevision);
+                if (FAILED(rc))
+                    uRevision = 0;
+
                 if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("GuestAdditionsVersion=\"%ls\"\n", guestString.raw());
+                    RTPrintf("GuestAdditionsVersion=\"%ls r%u\"\n", guestString.raw(), uRevision);
                 else
-                    RTPrintf("Additions version:                   %ls\n\n", guestString.raw());
+                    RTPrintf("Additions version:                   %ls r%u\n\n", guestString.raw(), uRevision);
             }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

@@ -452 +452 @@
     {
         CConsole console = mSession.GetConsole();
+
         ULONG width = 0;
         ULONG height = 0;
@@ -461 +462 @@
         if (bpp)
             resolution += QString ("x%1").arg (bpp);
-        QString virtualization = console.GetDebugger().GetHWVirtExEnabled() ?
+
+        CMachineDebugger debugger = console.GetDebugger();
+        QString virtualization = debugger.GetHWVirtExEnabled() ?
             VBoxGlobal::tr ("Enabled", "details report (VT-x/AMD-V)") :
             VBoxGlobal::tr ("Disabled", "details report (VT-x/AMD-V)");
-        QString nested = console.GetDebugger().GetHWVirtExNestedPagingEnabled() ?
+        QString nested = debugger.GetHWVirtExNestedPagingEnabled() ?
             VBoxGlobal::tr ("Enabled", "details report (Nested Paging)") :
             VBoxGlobal::tr ("Disabled", "details report (Nested Paging)");
-        QString addVersionStr = console.GetGuest().GetAdditionsVersion();
+
+        CGuest guest = console.GetGuest();
+        QString addVersionStr = guest.GetAdditionsVersion();
         if (addVersionStr.isEmpty())
-            addVersionStr = tr ("Not Detected", "guest additions");
-        QString osType = console.GetGuest().GetOSTypeId();
+            addVersionStr = tr("Not Detected", "guest additions");
+        else
+        {
+            ULONG revision = guest.GetAdditionsRevision();
+            if (revision != 0)
+                addVersionStr += QString(" r%1").arg(revision);
+        }
+        QString osType = guest.GetOSTypeId();
         if (osType.isEmpty())
             osType = tr ("Not Detected", "guest os type");
         else
             osType = vboxGlobal().vmGuestOSTypeDescription (osType);
+
         int vrdePort = console.GetVRDEServerInfo().GetPort();
         QString vrdeInfo = (vrdePort == 0 || vrdePort == -1)?