Changeset 29307 in vbox for trunk/include

Timestamp:

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

Author:

vboxsync

Message:

Shared paging interface updates

Location:

trunk/include/VBox

Files:

• VBoxGuestLib.h (modified) (1 diff)
• VMMDev.h (modified) (5 diffs)
• gmm.h (modified) (1 diff)
• ostypes.h (modified) (1 diff)
• pdmifs.h (modified) (1 diff)
• pgm.h (modified) (1 diff)

trunk/include/VBox/VBoxGuestLib.h

@@ -561 +561 @@
 VBGLR3DECL(int)     VbglR3UnregisterSharedModule(char *pszModuleName, char *pszVersion, RTGCPTR64  GCBaseAddr, uint32_t cbModule);
 VBGLR3DECL(int)     VbglR3CheckSharedModules(void);
+VBGLR3DECL(bool)    VbglR3PageSharingIsEnabled(void);
 /** @} */
 

trunk/include/VBox/VMMDev.h

@@ -175 +175 @@
     VMMDevReq_UnregisterSharedModule     = 213,
     VMMDevReq_CheckSharedModules         = 214,
+    VMMDevReq_GetPageSharingStatus       = 215,
 #endif
     VMMDevReq_SizeHack                   = 0x7fffffff
@@ -1128 +1129 @@
     /** Base address of the shared module. */
     RTGCPTR64                   GCBaseAddr;
+    /** Guest OS type. */
+    VBOXOSFAMILY                enmGuestOS;
+    /** Alignment. */
+    uint32_t                    u32Align;
     /** Module name */
     char                        szName[128];
@@ -1135 +1140 @@
     VMMDEVSHAREDREGIONDESC      aRegions[1];
 } VMMDevSharedModuleRegistrationRequest;
-AssertCompileSize(VMMDevSharedModuleRegistrationRequest, 24+4+4+8+128+16+16);
+AssertCompileSize(VMMDevSharedModuleRegistrationRequest, 24+4+4+8+4+4+128+16+16);
 
 
@@ -1168 +1173 @@
 } VMMDevSharedModuleCheckRequest;
 AssertCompileSize(VMMDevSharedModuleCheckRequest, 24);
+
+/**
+ * Paging sharing enabled query
+ */
+typedef struct
+{
+    /** Header. */
+    VMMDevRequestHeader         header;
+    /** Enabled flag (out) */
+    bool                        fEnabled;
+    /** Alignment */
+    bool                        fAlignment[3];
+} VMMDevPageSharingStatusRequest;
+AssertCompileSize(VMMDevPageSharingStatusRequest, 24+4);
 
 #pragma pack()
@@ -1678 +1697 @@
         case VMMDevReq_CheckSharedModules:
             return sizeof(VMMDevSharedModuleCheckRequest);
+        case VMMDevReq_GetPageSharingStatus:
+            return sizeof(VMMDevPageSharingStatusRequest);
 #endif
 

trunk/include/VBox/gmm.h

@@ -478 +478 @@
     /** Base address of the shared module. */
     RTGCPTR64                   GCBaseAddr;
+    /** Guest OS type. */
+    VBOXOSFAMILY                enmGuestOS;
+    /** Alignment. */
+    uint32_t                    u32Alignment;
     /** Module name */
     char                        szName[GMM_SHARED_MODULE_MAX_NAME_STRING];

trunk/include/VBox/ostypes.h

@@ -116 +116 @@
 } VBOXOSTYPE;
 
+/**
+ * Global list of guest OS families.
+ */
+typedef enum VBOXOSFAMILY
+{
+    VBOXOSFAMILY_Unknown          = 0,
+    VBOXOSFAMILY_Windows32        = 1,
+    VBOXOSFAMILY_Windows64        = 2,
+    VBOXOSFAMILY_Linux32          = 3,
+    VBOXOSFAMILY_Linux64          = 4,
+    VBOXOSFAMILY_FreeBSD32        = 5,
+    VBOXOSFAMILY_FreeBSD64        = 6,
+    VBOXOSFAMILY_Solaris32        = 7,
+    VBOXOSFAMILY_Solaris64        = 8,
+    VBOXOSFAMILY_MacOSX32         = 9,
+    VBOXOSFAMILY_MacOSX64         = 10,
+    /** The usual 32-bit hack. */
+    VBOXOSFAMILY_32BIT_HACK = 0x7fffffff
+} VBOXOSFAMILY;
+
 RT_C_DECLS_END
 

trunk/include/VBox/pdmifs.h

@@ -2035 +2035 @@
     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. */

trunk/include/VBox/pgm.h

@@ -567 +567 @@
 /** @name Page sharing
  * @{ */
-VMMR3DECL(int)     PGMR3SharedModuleRegister(PVM pVM, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule, unsigned cRegions, VMMDEVSHAREDREGIONDESC *pRegions);
+VMMR3DECL(int)     PGMR3SharedModuleRegister(PVM pVM, VBOXOSFAMILY enmGuestOS, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule, unsigned cRegions, VMMDEVSHAREDREGIONDESC *pRegions);
 VMMR3DECL(int)     PGMR3SharedModuleUnregister(PVM pVM, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule);
 /** @} */