Changeset 29590 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Connect page fusion part 2

Location:

trunk

Files:

trunk/include/VBox/pdmifs.h

-              r29589
+              r29590
     DECLR3CALLBACKMEMBER(int, pfnCpuHotPlug, (PPDMIVMMDEVPORT pInterface, uint32_t idCpuCore, uint32_t idCpuPackage));
-    /**
-     * Enable or disable page sharing
+     *
-     * @returns VBox status code
-     * @param   fEnabled     New setting
-     */
-    DECLR3CALLBACKMEMBER(int, pfnEnablePageSharing, (PPDMIVMMDEVPORT pInterface, bool fEnabled));
 } PDMIVMMDEVPORT;
 /** PDMIVMMDEVPORT interface ID. */

-              r29571
+              r29590
 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

-              r29425
+              r29590
             else
+            {
+                pReqStatus->fEnabled = pThis->fPageSharingEnabled;
+                pReqStatus->fEnabled = false;
+                pThis->pDrv->pfnIsPageFusionEnabled(pThis->pDrv, &pReqStatus->fEnabled);
                 pRequestHeader->rc = VINF_SUCCESS;
+            }
 …
+    }
-    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;
 …
     pThis->IPort.pfnRequestSeamlessChange  = vmmdevRequestSeamlessChange;
     pThis->IPort.pfnSetMemoryBalloon       = vmmdevSetMemoryBalloon;
-    pThis->IPort.pfnEnablePageSharing      = vmmdevEnablePageSharing;
     pThis->IPort.pfnSetStatisticsInterval  = vmmdevSetStatisticsInterval;
     pThis->IPort.pfnVRDPChange             = vmmdevVRDPChange;

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

Note: See TracChangeset for help on using the changeset viewer.