Changeset 39084 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 22, 2011 12:37:15 AM (13 years ago)

Author:

vboxsync

Message:

VMM: -Wunused-parameter on mac.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PGM.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (4 diffs)
• PGMSharedPage.cpp (modified) (16 diffs)

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -672 +672 @@
 # ifdef VBOX_STRICT
     { "pgmassertcr3",  0, 0,        NULL,                     0,         0,      pgmR3CmdAssertCR3,  "",                     "Check the shadow CR3 mapping." },
-#  if HC_ARCH_BITS == 64
+#  ifdef VBOX_WITH_PAGE_SHARING
     { "pgmcheckduppages", 0, 0,     NULL,                     0,         0,      pgmR3CmdCheckDuplicatePages,  "",           "Check for duplicate pages in all running VMs." },
     { "pgmsharedmodules", 0, 0,     NULL,                     0,         0,      pgmR3CmdShowSharedModules,  "",             "Print shared modules info." },

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -923 +923 @@
 
 #if HC_ARCH_BITS == 64 && (defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD))
+
 /**
  * Rendezvous callback used by PGMR3ChangeMemBalloon that changes the memory balloon size
@@ -1042 +1043 @@
 }
 
+
 /**
  * Frees a range of ram pages, replacing them with ZERO pages; helper for PGMR3PhysFreeRamPages
@@ -1064 +1066 @@
     RTMemFree(paPhysPage);
 }
-#endif
+
+#endif /* 64-bit host && (Windows || Solaris || Linux || FreeBSD) */
 
 /**
@@ -1109 +1112 @@
     }
     return rc;
+
 #else
+    NOREF(pVM); NOREF(fInflate); NOREF(cPages); NOREF(paPhysPage);
     return VERR_NOT_IMPLEMENTED;
 #endif
 }
+
 
 /**

trunk/src/VBox/VMM/VMMR3/PGMSharedPage.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -36 +36 @@
 #include "PGMInline.h"
 
+
 /*******************************************************************************
 *   Global Variables                                                           *
 *******************************************************************************/
-#if defined(VBOX_STRICT) && HC_ARCH_BITS == 64
+#if defined(VBOX_WITH_PAGE_SHARING) && defined(VBOX_STRICT)
 /** Keep a copy of all registered shared modules for the .pgmcheckduppages debugger command. */
-static PGMMREGISTERSHAREDMODULEREQ g_apSharedModules[512] = {0};
-static unsigned g_cSharedModules = 0;
+static PGMMREGISTERSHAREDMODULEREQ  g_apSharedModules[512] = {0};
+static unsigned                     g_cSharedModules = 0;
 #endif
+
 
 /**
@@ -58 +60 @@
  * @param   pRegions            Shared region(s)
  */
-VMMR3DECL(int) PGMR3SharedModuleRegister(PVM pVM, VBOXOSFAMILY enmGuestOS, 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)
 {
 #ifdef VBOX_WITH_PAGE_SHARING
-    PGMMREGISTERSHAREDMODULEREQ pReq;
-
     Log(("PGMR3SharedModuleRegister family=%d name=%s version=%s base=%RGv size=%x cRegions=%d\n", enmGuestOS, pszModuleName, pszVersion, GCBaseAddr, cbModule, cRegions));
 
@@ -69 +70 @@
     AssertReturn(cRegions < VMMDEVSHAREDREGIONDESC_MAX, VERR_INVALID_PARAMETER);
 
+    PGMMREGISTERSHAREDMODULEREQ pReq;
     pReq = (PGMMREGISTERSHAREDMODULEREQ)RTMemAllocZ(RT_OFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[cRegions]));
     AssertReturn(pReq, VERR_NO_MEMORY);
@@ -87 +89 @@
 
     int rc = GMMR3RegisterSharedModule(pVM, pReq);
-# if defined(VBOX_STRICT) && HC_ARCH_BITS == 64
+# ifdef VBOX_STRICT
     if (rc == VINF_SUCCESS)
     {
@@ -106 +108 @@
             if (ppSharedModule)
             {
-                *ppSharedModule = (PGMMREGISTERSHAREDMODULEREQ)RTMemAllocZ(RT_OFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[cRegions]));
-                memcpy(*ppSharedModule, pReq, RT_OFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[cRegions]));
+                size_t const cbSharedModule = RT_OFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[cRegions]);
+                *ppSharedModule = (PGMMREGISTERSHAREDMODULEREQ)RTMemDup(pReq, cbSharedModule);
                 g_cSharedModules++;
             }
         }
     }
-# endif
+# endif /* VBOX_STRICT */
 
     RTMemFree(pReq);
@@ -120 +122 @@
 
     return VINF_SUCCESS;
-#else
+#else  /* !VBOX_WITH_PAGE_SHARING */
+
+    NOREF(pVM); NOREF(enmGuestOS); NOREF(pszModuleName); NOREF(pszVersion); NOREF(GCBaseAddr);
+    NOREF(cbModule); NOREF(cRegions); NOREF(pRegions);
     return VERR_NOT_IMPLEMENTED;
-#endif
-}
+#endif /* !VBOX_WITH_PAGE_SHARING */
+}
+
 
 /**
@@ -148 +154 @@
     pReq->cbModule      = cbModule;
 
-    if (    RTStrCopy(pReq->szName, sizeof(pReq->szName), pszModuleName) != VINF_SUCCESS
-        ||  RTStrCopy(pReq->szVersion, sizeof(pReq->szVersion), pszVersion) != VINF_SUCCESS)
+    if (   RTStrCopy(pReq->szName, sizeof(pReq->szName), pszModuleName) != VINF_SUCCESS
+        || RTStrCopy(pReq->szVersion, sizeof(pReq->szVersion), pszVersion) != VINF_SUCCESS)
     {
         RTMemFree(pReq);
@@ -157 +163 @@
     RTMemFree(pReq);
 
-# if defined(VBOX_STRICT) && HC_ARCH_BITS == 64
+# ifdef VBOX_STRICT
     for (unsigned i = 0; i < g_cSharedModules; i++)
     {
@@ -170 +176 @@
         }
     }
-# endif
+# endif /* VBOX_STRICT */
     return rc;
-#else
+#else  /* !VBOX_WITH_PAGE_SHARING */
+
+    NOREF(pVM); NOREF(pszModuleName); NOREF(pszVersion); NOREF(GCBaseAddr); NOREF(cbModule);
     return VERR_NOT_IMPLEMENTED;
-#endif
+#endif /* !VBOX_WITH_PAGE_SHARING */
 }
 
 #ifdef VBOX_WITH_PAGE_SHARING
+
 /**
  * Rendezvous callback that will be called once.
@@ -221 +230 @@
     AssertRCSuccess(rc);
 }
-#endif
+
+#endif /* !VBOX_WITH_PAGE_SHARING */
 
 /**
@@ -235 +245 @@
     return VMR3ReqCallNoWait(pVM, VMCPUID_ANY_QUEUE, (PFNRT)pgmR3CheckSharedModulesHelper, 2, pVM, VMMGetCpuId(pVM));
 #else
+    NOREF(pVM);
     return VERR_NOT_IMPLEMENTED;
 #endif
 }
 
+
 /**
  * Query the state of a page in a shared module
  *
  * @returns VBox status code.
- * @param   pVM                 VM handle
- * @param   GCPtrPage           Page address
- * @param   pfShared            Shared status (out)
- * @param   puPageFlags         Page flags (out)
- */
-VMMR3DECL(int) PGMR3SharedModuleGetPageState(PVM pVM, RTGCPTR GCPtrPage, bool *pfShared, uint64_t *puPageFlags)
+ * @param   pVM                 VM handle.
+ * @param   GCPtrPage           Page address.
+ * @param   pfShared            Shared status (out).
+ * @param   pfPageFlags         Page flags (out).
+ */
+VMMR3DECL(int) PGMR3SharedModuleGetPageState(PVM pVM, RTGCPTR GCPtrPage, bool *pfShared, uint64_t *pfPageFlags)
 {
 #if defined(VBOX_WITH_PAGE_SHARING) && defined(DEBUG)
@@ -266 +278 @@
         {
             *pfShared    = PGM_PAGE_IS_SHARED(pPage);
-            *puPageFlags = fFlags;
+            *pfPageFlags = fFlags;
         }
         else
@@ -277 +289 @@
     case VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT:
         *pfShared = false;
-        *puPageFlags = 0;
+        *pfPageFlags = 0;
         rc = VINF_SUCCESS;
         break;
@@ -288 +300 @@
     return rc;
 #else
+    NOREF(pVM); NOREF(GCPtrPage); NOREF(pfShared); NOREF(pfPageFlags);
     return VERR_NOT_IMPLEMENTED;
 #endif
 }
 
-#if defined(VBOX_STRICT) && HC_ARCH_BITS == 64
+#if defined(VBOX_WITH_PAGE_SHARING) && defined(VBOX_STRICT)
 
 /**
@@ -415 +428 @@
 }
 
-#endif /* VBOX_STRICT && HC_ARCH_BITS == 64*/
+#endif /* VBOX_STRICT && VBOX_WITH_PAGE_SHARING */