Changeset 3586 in vbox

Timestamp:

Jul 12, 2007 2:38:12 PM (18 years ago)

Author:

vboxsync

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

22835

Message:

Added request for generic guest capability reporting

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (3 diffs)
• src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (6 diffs)
• src/VBox/Devices/VMMDev/VMMDevState.h (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -136 +136 @@
     VMMDevReq_GetHeightReduction         = 53,
     VMMDevReq_GetDisplayChangeRequest2   = 54,
+    VMMDevReq_ReportGuestCapabilities    = 55,
 #ifdef VBOX_HGCM
     VMMDevReq_HGCMConnect                = 60,
@@ -260 +261 @@
     uint32_t build;
 } VMMDevReqHostVersion;
+
+/** guest capabilites structure */
+typedef struct
+{
+    /** header */
+    VMMDevRequestHeader header;
+    /** capabilities (VMMDEV_GUEST_*) */
+    uint32_t    caps;
+} VMMDevReqGuestCapabilities;
 
 /** idle request structure */
@@ -1184 +1194 @@
         case VMMDevReq_GetHeightReduction:
             return sizeof(VMMDevGetHeightReductionRequest);
+        case VMMDevReq_ReportGuestCapabilities:
+            return sizeof(VMMDevReqGuestCapabilities);
 #ifdef VBOX_HGCM
         case VMMDevReq_HGCMConnect:

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

@@ -499 +499 @@
                     requestHeader->rc = VERR_VERSION_MISMATCH;
                 }
+            }
+            break;
+        }
+
+        /* Report guest capabilities */
+        case VMMDevReq_ReportGuestCapabilities:
+        {
+            if (requestHeader->size != sizeof(VMMDevReqGuestCapabilities))
+            {
+                AssertMsgFailed(("VMMDev guest caps structure has invalid size!\n"));
+                requestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                VMMDevReqGuestCapabilities *guestCaps = (VMMDevReqGuestCapabilities*)requestHeader;
+
+                if (pData->guestCaps != guestCaps->caps)
+                {
+                    /* make a copy of supplied information */
+                    pData->guestCaps = guestCaps->caps;
+
+                    pData->pDrv->pfnUpdateGuestCapabilities(pData->pDrv, guestCaps->caps);
+                }
+                requestHeader->rc = VINF_SUCCESS;
             }
             break;
@@ -1589 +1613 @@
 
 
-#define VMMDEV_SSM_VERSION 3
+#define VMMDEV_SSM_VERSION  4
 
 /**
@@ -1618 +1642 @@
     SSMR3PutU32(pSSMHandle, pData->u32VideoAccelEnabled);
 
+    SSMR3PutU32(pSSMHandle, pData->guestCaps);
+
 #ifdef VBOX_HGCM
     vmmdevHGCMSaveState (pData, pSSMHandle);
@@ -1655 +1681 @@
     SSMR3GetU32(pSSMHandle, &pData->u32VideoAccelEnabled);
 
+    SSMR3GetU32(pSSMHandle, &pData->guestCaps);
+
 #ifdef VBOX_HGCM
     vmmdevHGCMLoadState (pData, pSSMHandle);
@@ -1679 +1707 @@
         pData->pDrv->pfnUpdateGuestVersion(pData->pDrv, &pData->guestInfo);
     }
+    pData->pDrv->pfnUpdateGuestCapabilities(pData->pDrv, pData->guestCaps);
 
     return VINF_SUCCESS;
@@ -1912 +1941 @@
     pData->fu32AdditionsOk = false;
     memset (&pData->guestInfo, 0, sizeof (pData->guestInfo));
+    pData->guestCaps = 0;
 
     memset (&pData->lastReadDisplayChangeRequest, 0, sizeof (pData->lastReadDisplayChangeRequest));

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

@@ -96 +96 @@
     VBoxGuestInfo guestInfo;
 
+    /** Information reported by guest via VMMDevReportGuestCapabilities
+     */
+    uint32_t      guestCaps;
+
     /** "Additions are Ok" indicator, set to true after processing VMMDevReportGuestInfo,
      * if additions version is compatible. This flag is here to avoid repeated comparing