Changeset 62776 in vbox

Timestamp:

Jul 31, 2016 9:58:30 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109363

Message:

VMM: warnings.

Location:

trunk/src/VBox/VMM

Files:

• testcase/tstAnimate.cpp (modified) (4 diffs)
• testcase/tstCFGM.cpp (modified) (1 diff)
• testcase/tstMMHyperHeap.cpp (modified) (2 diffs)
• testcase/tstMicro.cpp (modified) (2 diffs)
• testcase/tstPDMAsyncCompletion.cpp (modified) (2 diffs)
• testcase/tstPDMAsyncCompletionStress.cpp (modified) (4 diffs)
• testcase/tstSSM.cpp (modified) (1 diff)
• testcase/tstVMREQ.cpp (modified) (2 diffs)
• testcase/tstX86-FpuSaveRestore.cpp (modified) (1 diff)
• tools/VBoxCpuReport.cpp (modified) (1 diff)

trunk/src/VBox/VMM/testcase/tstAnimate.cpp

@@ -128 +128 @@
 
 
-
+/* variables - putting in global scope to avoid MSC warning C4640.  */
+static struct
+{
+    const char *pszVar;
+    int (*pfnHandler)(PVM pVM, char *pszVar, char *pszValue, void *pvUser);
+    PFNRT pvUser;
+} g_aVars[] =
+{
+    { "eax", scriptGPReg,  (PFNRT)CPUMSetGuestEAX },
+    { "ebx", scriptGPReg,  (PFNRT)CPUMSetGuestEBX },
+    { "ecx", scriptGPReg,  (PFNRT)CPUMSetGuestECX },
+    { "edx", scriptGPReg,  (PFNRT)CPUMSetGuestEDX },
+    { "esp", scriptGPReg,  (PFNRT)CPUMSetGuestESP },
+    { "ebp", scriptGPReg,  (PFNRT)CPUMSetGuestEBP },
+    { "esi", scriptGPReg,  (PFNRT)CPUMSetGuestESI },
+    { "edi", scriptGPReg,  (PFNRT)CPUMSetGuestEDI },
+    { "efl", scriptGPReg,  (PFNRT)CPUMSetGuestEFlags },
+    { "eip", scriptGPReg,  (PFNRT)CPUMSetGuestEIP },
+    { "ss",  scriptSelReg, (PFNRT)CPUMSetGuestSS },
+    { "cs",  scriptSelReg, (PFNRT)CPUMSetGuestCS },
+    { "ds",  scriptSelReg, (PFNRT)CPUMSetGuestDS },
+    { "es",  scriptSelReg, (PFNRT)CPUMSetGuestES },
+    { "fs",  scriptSelReg, (PFNRT)CPUMSetGuestFS },
+    { "gs",  scriptSelReg, (PFNRT)CPUMSetGuestGS },
+    { "cr0", scriptSysReg, (PFNRT)CPUMSetGuestCR0 },
+    { "cr2", scriptSysReg, (PFNRT)CPUMSetGuestCR2 },
+    { "cr3", scriptSysReg, (PFNRT)CPUMSetGuestCR3 },
+    { "cr4", scriptSysReg, (PFNRT)CPUMSetGuestCR4 },
+    { "ldtr",scriptSelReg, (PFNRT)CPUMSetGuestLDTR },
+    { "tr",  scriptSelReg, (PFNRT)CPUMSetGuestTR },
+    { "idtr",scriptDtrReg, (PFNRT)CPUMSetGuestIDTR },
+    { "gdtr",scriptDtrReg, (PFNRT)CPUMSetGuestGDTR }
+};
 
 
@@ -146 +178 @@
         char *pszValue = RTStrStrip(pszEqual + 1);
 
-        /* variables */
-        static struct
-        {
-            const char *pszVar;
-            int (*pfnHandler)(PVM pVM, char *pszVar, char *pszValue, void *pvUser);
-            PFNRT pvUser;
-        } aVars[] =
-        {
-            { "eax", scriptGPReg,  (PFNRT)CPUMSetGuestEAX },
-            { "ebx", scriptGPReg,  (PFNRT)CPUMSetGuestEBX },
-            { "ecx", scriptGPReg,  (PFNRT)CPUMSetGuestECX },
-            { "edx", scriptGPReg,  (PFNRT)CPUMSetGuestEDX },
-            { "esp", scriptGPReg,  (PFNRT)CPUMSetGuestESP },
-            { "ebp", scriptGPReg,  (PFNRT)CPUMSetGuestEBP },
-            { "esi", scriptGPReg,  (PFNRT)CPUMSetGuestESI },
-            { "edi", scriptGPReg,  (PFNRT)CPUMSetGuestEDI },
-            { "efl", scriptGPReg,  (PFNRT)CPUMSetGuestEFlags },
-            { "eip", scriptGPReg,  (PFNRT)CPUMSetGuestEIP },
-            { "ss",  scriptSelReg, (PFNRT)CPUMSetGuestSS },
-            { "cs",  scriptSelReg, (PFNRT)CPUMSetGuestCS },
-            { "ds",  scriptSelReg, (PFNRT)CPUMSetGuestDS },
-            { "es",  scriptSelReg, (PFNRT)CPUMSetGuestES },
-            { "fs",  scriptSelReg, (PFNRT)CPUMSetGuestFS },
-            { "gs",  scriptSelReg, (PFNRT)CPUMSetGuestGS },
-            { "cr0", scriptSysReg, (PFNRT)CPUMSetGuestCR0 },
-            { "cr2", scriptSysReg, (PFNRT)CPUMSetGuestCR2 },
-            { "cr3", scriptSysReg, (PFNRT)CPUMSetGuestCR3 },
-            { "cr4", scriptSysReg, (PFNRT)CPUMSetGuestCR4 },
-            { "ldtr",scriptSelReg, (PFNRT)CPUMSetGuestLDTR },
-            { "tr",  scriptSelReg, (PFNRT)CPUMSetGuestTR },
-            { "idtr",scriptDtrReg, (PFNRT)CPUMSetGuestIDTR },
-            { "gdtr",scriptDtrReg, (PFNRT)CPUMSetGuestGDTR }
-        };
-
         rc = -1;
-        for (unsigned i = 0; i < RT_ELEMENTS(aVars); i++)
-        {
-            if (!strcmp(psz, aVars[i].pszVar))
+        for (unsigned i = 0; i < RT_ELEMENTS(g_aVars); i++)
+        {
+            if (!strcmp(psz, g_aVars[i].pszVar))
             {
-                rc = aVars[i].pfnHandler(pVM, psz, pszValue, (void*)(uintptr_t)aVars[i].pvUser);
+                rc = g_aVars[i].pfnHandler(pVM, psz, pszValue, (void *)(uintptr_t)g_aVars[i].pvUser);
                 break;
             }
@@ -332 +330 @@
 static DECLCALLBACK(int) cfgmR3CreateDefault(PUVM pUVM, PVM pVM, void *pvUser)
 {
+    RT_NOREF1(pUVM);
     uint64_t cbMem = *(uint64_t *)pvUser;
     int rc;
@@ -625 +624 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
+    RT_NOREF1(envp);
     int rcRet = 1;
     int rc;

trunk/src/VBox/VMM/testcase/tstCFGM.cpp

@@ -142 +142 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
+    RT_NOREF3(argc, argv, envp);
+
     /*
      * Init runtime.

trunk/src/VBox/VMM/testcase/tstMMHyperHeap.cpp

@@ -44 +44 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
+    RT_NOREF1(envp);
 
     /*
@@ -53 +54 @@
      * Create empty VM structure and call MMR3Init().
      */
-    PVM         pVM;
-    RTR0PTR     pvR0;
+    PVM         pVM = NULL;
+    RTR0PTR     pvR0 = NIL_RTR0PTR;
     SUPPAGE     aPages[RT_ALIGN_Z(sizeof(*pVM) + NUM_CPUS * sizeof(VMCPU), PAGE_SIZE) >> PAGE_SHIFT];
     int rc = SUPR3Init(NULL);

trunk/src/VBox/VMM/testcase/tstMicro.cpp

@@ -291 +291 @@
     {
         TSTMICROTEST enmTest = (TSTMICROTEST)i;
-        uint64_t    cMin = ~0;
+        uint64_t    cMin = UINT64_MAX;
         uint64_t    cMax = 0;
         uint64_t    cTotal = 0;
@@ -346 +346 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
+    RT_NOREF1(envp);
     int     rcRet = 0;                  /* error count. */
 

trunk/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp

@@ -62 +62 @@
 static DECLCALLBACK(void) AsyncTaskCompleted(PVM pVM, void *pvUser, void *pvUser2, int rc)
 {
+    RT_NOREF4(pVM, pvUser, pvUser2, rc);
     LogFlow((TESTCASE ": %s: pVM=%p pvUser=%p pvUser2=%p\n", __FUNCTION__, pVM, pvUser, pvUser2));
-    NOREF(rc);
 
     uint32_t cTasksStillLeft = ASMAtomicDecU32(&g_cTasksLeft);
@@ -79 +79 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
+    RT_NOREF1(envp);
     int rcRet = 0; /* error count */
     PPDMASYNCCOMPLETIONENDPOINT pEndpointSrc, pEndpointDst;

trunk/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp

@@ -132 +132 @@
     size_t                     cbFileSegment;
     /** Maximum number of segments. */
-    unsigned                   cSegments;
+    size_t                     cSegments;
     /** Pointer to the array describing how the file is assembled
      * of the test pattern. Used for comparing read data to ensure
@@ -168 +168 @@
     {
         size_t cbCompare;
-        unsigned iSeg = off / pTestFile->cbFileSegment;
+        size_t iSeg = off / pTestFile->cbFileSegment;
         PPDMACTESTFILESEG pSeg = &pTestFile->paSegs[iSeg];
         uint8_t *pbTestPattern;
@@ -208 +208 @@
     {
         size_t cbFill;
-        unsigned iSeg = off / pTestFile->cbFileSegment;
+        size_t iSeg = off / pTestFile->cbFileSegment;
         PPDMACTESTFILESEG pSeg = &pTestFile->paSegs[iSeg];
         uint8_t *pbTestPattern;
@@ -575 +575 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
+    RT_NOREF1(envp);
     int rcRet = 0; /* error count */
 

trunk/src/VBox/VMM/testcase/tstSSM.cpp

@@ -703 +703 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
+    RT_NOREF1(envp);
+
     /*
      * Init runtime and static data.

trunk/src/VBox/VMM/testcase/tstVMREQ.cpp

@@ -212 +212 @@
 tstVMREQConfigConstructor(PUVM pUVM, PVM pVM, void *pvUser)
 {
-    NOREF(pvUser);
+    RT_NOREF2(pUVM, pvUser);
     return CFGMR3ConstructDefaultTree(pVM);
 }
@@ -221 +221 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
+    RT_NOREF1(envp);
     RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_SUPLIB);
     RTPrintf(TESTCASE ": TESTING...\n");

trunk/src/VBox/VMM/testcase/tstX86-FpuSaveRestore.cpp

@@ -36 +36 @@
     RTTEST hTest;
     int rc = RTTestInitAndCreate("tstX86-FpuSaveRestore", &hTest);
+    if (RT_FAILURE(rc))
+        return RTEXITCODE_FAILURE;
     RTTestBanner(hTest);
-
-
 
     RTTestSub(hTest, "CS/DS Selector");

trunk/src/VBox/VMM/tools/VBoxCpuReport.cpp

@@ -2618 +2618 @@
 static void adjustCanonicalIgnAndGpMasks(uint32_t uMsr, uint64_t *pfIgn, uint64_t *pfGp)
 {
+    RT_NOREF1(pfIgn);
     if (!vbCpuRepSupportsLongMode())
         return;