Changeset 29590 in vbox for trunk/src/VBox

Timestamp:

May 18, 2010 7:02:17 AM (15 years ago)

Author:

vboxsync

Message:

Connect page fusion part 2

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• VMMDev/VMMDev.cpp (modified) (3 diffs)
• VMMDev/VMMDevState.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -289 +289 @@
 DevicesR3_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
 DevicesR3_DEFS         += VBOX_HGCM_HOST_CODE \
-                          VBOX_WITH_HGCM \
-                          $(if $(VBOX_WITH_PAGE_SHARING),VBOX_WITH_PAGE_SHARING,)
+                          VBOX_WITH_HGCM
 DevicesR3_DEFS.linux   += _GNU_SOURCE
 DevicesR3_DEFS.l4      += _GNU_SOURCE

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

@@ -1816 +1816 @@
             else
             {
-                pReqStatus->fEnabled = pThis->fPageSharingEnabled;
+                pReqStatus->fEnabled = false;
+                pThis->pDrv->pfnIsPageFusionEnabled(pThis->pDrv, &pReqStatus->fEnabled);
                 pRequestHeader->rc = VINF_SUCCESS;
             }
@@ -2196 +2197 @@
     }
 
-    PDMCritSectLeave(&pThis->CritSect);
-    return VINF_SUCCESS;
-}
-
-static DECLCALLBACK(int) vmmdevEnablePageSharing(PPDMIVMMDEVPORT pInterface, bool fEnabled)
-{
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
-    PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
-
-    Log(("vmmdevEnablePageSharing: old=%d. new=%d\n", pThis->fPageSharingEnabled, fEnabled));
-    pThis->fPageSharingEnabled = fEnabled;
     PDMCritSectLeave(&pThis->CritSect);
     return VINF_SUCCESS;
@@ -2761 +2751 @@
     pThis->IPort.pfnRequestSeamlessChange  = vmmdevRequestSeamlessChange;
     pThis->IPort.pfnSetMemoryBalloon       = vmmdevSetMemoryBalloon;
-    pThis->IPort.pfnEnablePageSharing      = vmmdevEnablePageSharing;
     pThis->IPort.pfnSetStatisticsInterval  = vmmdevSetStatisticsInterval;
     pThis->IPort.pfnVRDPChange             = vmmdevVRDPChange;

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

@@ -171 +171 @@
     bool fLastSeamlessEnabled, fSeamlessEnabled;
 
-    /* shared paging change request. */
-    bool fPageSharingEnabled;
-
     bool fVRDPEnabled;
     uint32_t u32VRDPExperienceLevel;