vbox的更動 8425 路徑 trunk/src/VBox/Devices/VMMDev

時間撮記:

2008-4-28 下午03:03:37 (17 年 以前)

作者:

vboxsync

訊息:

Frontends/VirtualBox3/4, Main, Devices/VMMDev, Frontends/VBoxBFE, Additions/common, Additions/x11: reverted r30152, r30085, r30074 and r30072

位置:

trunk/src/VBox/Devices/VMMDev

檔案:

• VBoxDev.cpp (修改) (7 筆差異)
• VMMDevState.h (修改) (1 筆差異)

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

@@ -572 +572 @@
 
                 pData->pDrv->pfnUpdateGuestCapabilities(pData->pDrv, pData->guestCaps);
-                pRequestHeader->rc = VINF_SUCCESS;
-            }
-            break;
-        }
-
-        case VMMDevReq_SetMaxGuestResolution:
-        {
-            if (pRequestHeader->size != sizeof(VMMDevReqGuestResolution))
-            {
-                AssertMsgFailed(("VMMDev guest resolution structure has invalid size!\n"));
-                pRequestHeader->rc = VERR_INVALID_PARAMETER;
-            }
-            else
-            {
-                VMMDevReqGuestResolution *guestRes = (VMMDevReqGuestResolution*)pRequestHeader;
-
-                pData->u32MaxGuestWidth  = guestRes->u32MaxWidth;
-                pData->u32MaxGuestHeight = guestRes->u32MaxHeight;
-
-                LogRel(("Guest Additions maximum resolution of %dx%d reported\n",
-                        pData->u32MaxGuestWidth, pData->u32MaxGuestHeight));
-
-                /* Only notify frontends that are interested (i.e. Main, but not BFE) */
-                if (NULL != pData->pDrv->pfnUpdateMaxGuestResolution)
-                    pData->pDrv->pfnUpdateMaxGuestResolution(pData->pDrv, pData->u32MaxGuestWidth, pData->u32MaxGuestHeight);
                 pRequestHeader->rc = VINF_SUCCESS;
             }
@@ -1972 +1947 @@
 
 
-#define VMMDEV_SSM_VERSION  7
+#define VMMDEV_SSM_VERSION  6
 
 /**
@@ -2003 +1978 @@
     SSMR3PutU32(pSSMHandle, pData->guestCaps);
 
-    SSMR3PutU32(pSSMHandle, pData->u32MaxGuestWidth);
-    SSMR3PutU32(pSSMHandle, pData->u32MaxGuestHeight);
-
 #ifdef VBOX_HGCM
     vmmdevHGCMSaveState (pData, pSSMHandle);
@@ -2024 +1996 @@
 {
     VMMDevState *pData = PDMINS2DATA(pDevIns, VMMDevState*);
-    if (   SSM_VERSION_MAJOR_CHANGED(u32Version, VMMDEV_SSM_VERSION)
-        || (SSM_VERSION_MINOR(u32Version) < 6))
+    if (u32Version != VMMDEV_SSM_VERSION)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     SSMR3GetU32(pSSMHandle, &pData->hypervisorSize);
@@ -2046 +2017 @@
     SSMR3GetU32(pSSMHandle, &pData->guestCaps);
 
-    if (   SSM_VERSION_MAJOR(u32Version) >  0
-        || SSM_VERSION_MINOR(u32Version) >= 7)
-    {
-        SSMR3GetU32(pSSMHandle, &pData->u32MaxGuestWidth);
-        SSMR3GetU32(pSSMHandle, &pData->u32MaxGuestHeight);
-    }
-
 #ifdef VBOX_HGCM
     vmmdevHGCMLoadState (pData, pSSMHandle);
@@ -2082 +2046 @@
     if (pData->pDrv)
         pData->pDrv->pfnUpdateGuestCapabilities(pData->pDrv, pData->guestCaps);
-
-    if (    pData->pDrv && pData->pDrv->pfnUpdateMaxGuestResolution)
-        pData->pDrv->pfnUpdateMaxGuestResolution(pData->pDrv, pData->u32MaxGuestWidth, pData->u32MaxGuestHeight);
 
     return VINF_SUCCESS;
@@ -2358 +2319 @@
     pData->fu32AdditionsOk = false;
     memset (&pData->guestInfo, 0, sizeof (pData->guestInfo));
-
-    /* No maximum resolution specified yet */
-    pData->u32MaxGuestWidth  = 0;
-    pData->u32MaxGuestHeight = 0;
 
     memset (&pData->lastReadDisplayChangeRequest, 0, sizeof (pData->lastReadDisplayChangeRequest));

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

@@ -108 +108 @@
     uint32_t u32VideoAccelEnabled;
 
-    /** Maximum guest resolution, width - a value of 0 mean no maximum */
-    uint32_t u32MaxGuestWidth;
-    /** Maximum guest resolution, height - a value of 0 mean no maximum */
-    uint32_t u32MaxGuestHeight;
-
     /** resolution change request */
     struct