Changeset 29307 in vbox for trunk/src/VBox/Additions/common

Timestamp:

May 10, 2010 3:18:22 PM (15 years ago)

Author:

vboxsync

Message:

Shared paging interface updates

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuestLib/VBoxGuestR3LibModule.cpp (modified) (3 diffs)
• VBoxService/VBoxServicePageSharing.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp

@@ -61 +61 @@
     pReq->cbModule      = cbModule;
     pReq->cRegions      = cRegions;
+#ifdef RT_OS_WINDOWS
+# if ARCH_BITS == 32
+    pReq->enmGuestOS    = VBOXOSFAMILY_Windows32;
+# else
+    pReq->enmGuestOS    = VBOXOSFAMILY_Windows64;
+# endif
+#else
+    /** todo */
+    pReq->enmGuestOS    = VBOXOSFAMILY_unknown;
+#endif
     for (unsigned i = 0; i < cRegions; i++)
         pReq->aRegions[i] = pRegions[i];
@@ -105 +115 @@
 
 /**
- * Checks regsitered modules for shared pages
+ * Checks registered modules for shared pages
  *
  * @returns IPRT status code.
@@ -117 +127 @@
 }
 
+/**
+ * Checks if page sharing is enabled.
+ *
+ * @returns true/false enabled/disabled
+ */
+VBGLR3DECL(bool) VbglR3PageSharingIsEnabled()
+{
+    VMMDevPageSharingStatusRequest Req;
+
+    vmmdevInitRequest(&Req.header, VMMDevReq_GetPageSharingStatus);
+    int rc = vbglR3GRPerform(&Req.header);
+    if (RT_SUCCESS(rc))
+        return Req.fEnabled;
+    return false;
+}
+

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

@@ -337 +337 @@
     AssertRCReturn(rc, rc);
 
-    /* @todo check if page sharing is active. */
     /* @todo report system name and version */
     /* Never fail here. */
@@ -358 +357 @@
     {
 
-        VBoxServicePageSharingInspectGuest();
+        if (VbglR3PageSharingIsEnabled())
+            VBoxServicePageSharingInspectGuest();
 
         /*