Changeset 80334 in vbox for trunk/src/VBox/VMM/testcase/tstMMHyperHeap.cpp

Timestamp:

Aug 17, 2019 12:43:24 AM (5 years ago)

Author:

vboxsync

Message:

VMM: Eliminating the VBOX_BUGREF_9217 preprocessor macro. bugref:9217

File:

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

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

@@ -57 +57 @@
     void       *pvVM = NULL;
     RTR0PTR     pvR0 = NIL_RTR0PTR;
-#ifdef VBOX_BUGREF_9217
     SUPPAGE     aPages[(sizeof(GVM) + NUM_CPUS * sizeof(GVMCPU)) >> PAGE_SHIFT];
-#else
-    SUPPAGE     aPages[(sizeof(VM) + NUM_CPUS * sizeof(VMCPU)) >> PAGE_SHIFT];
-#endif
     rc = SUPR3Init(NULL);
     if (RT_FAILURE(rc))
@@ -77 +73 @@
     PVM  pVM = (PVM)pvVM;
     pVM->paVMPagesR3 = aPages;
-#ifdef VBOX_BUGREF_9217
     pVM->pVMR0ForCall = pvR0;
-#else
-    pVM->pVMR0 = pvR0;
-#endif
 
     PUVM pUVM = (PUVM)RTMemPageAllocZ(RT_ALIGN_Z(sizeof(*pUVM), PAGE_SIZE));
@@ -94 +86 @@
 
     pVM->cCpus = NUM_CPUS;
-#ifdef VBOX_BUGREF_9217
     pVM->cbSelf = sizeof(VM);
     pVM->cbVCpu = sizeof(VMCPU);
@@ -103 +94 @@
         pVCpu = (PVMCPU)((uintptr_t)pVCpu + sizeof(GVMCPU));
     }
-#else
-    pVM->cbSelf = RT_UOFFSETOF_DYN(VM, aCpus[pVM->cCpus]);
-    for (VMCPUID idCpu = 0; idCpu < NUM_CPUS; idCpu++)
-        pVM->apCpusR3[idCpu] = &pVM->aCpus[idCpu];
-#endif
 
     rc = STAMR3InitUVM(pUVM);