Changeset 73579 in vbox

Timestamp:

Aug 9, 2018 8:51:16 AM (6 years ago)

Author:

vboxsync

Message:

tstMMHyperHeap: RT_BZERO is necessary. Trick GCC 8.2.0 in different way.

File:

• trunk/src/VBox/VMM/testcase/tstMMHyperHeap.cpp (modified) (2 diffs)

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

@@ -54 +54 @@
      * Create empty VM structure and call MMR3Init().
      */
-    PVM         pVM = NULL;
+    void       *pvVM = NULL;
     RTR0PTR     pvR0 = NIL_RTR0PTR;
-    SUPPAGE     aPages[RT_ALIGN_Z(sizeof(*pVM) + NUM_CPUS * sizeof(VMCPU), PAGE_SIZE) >> PAGE_SHIFT];
+    SUPPAGE     aPages[RT_ALIGN_Z(sizeof(VM) + NUM_CPUS * sizeof(VMCPU), PAGE_SIZE) >> PAGE_SHIFT];
     int rc = SUPR3Init(NULL);
     if (RT_SUCCESS(rc))
         //rc = SUPR3LowAlloc(RT_ELEMENTS(aPages), (void **)&pVM, &pvR0, &aPages[0]);
-        rc = SUPR3PageAllocEx(RT_ELEMENTS(aPages), 0, (void **)&pVM, &pvR0, &aPages[0]);
+        rc = SUPR3PageAllocEx(RT_ELEMENTS(aPages), 0, &pvVM, &pvR0, &aPages[0]);
     if (RT_FAILURE(rc))
     {
@@ -66 +66 @@
         return RTEXITCODE_FAILURE;
     }
+    RT_BZERO(pvVM, RT_ELEMENTS(aPages) * PAGE_SIZE); /* SUPR3PageAllocEx doesn't necessarily zero the memory. */
+    PVM  pVM = (PVM)pvVM;
     pVM->paVMPagesR3 = aPages;
     pVM->pVMR0 = pvR0;