Index: /trunk/src/VBox/VMM/GMM.cpp
===================================================================
--- /trunk/src/VBox/VMM/GMM.cpp	(revision 30343)
+++ /trunk/src/VBox/VMM/GMM.cpp	(revision 30344)
@@ -306,6 +306,5 @@
 
     /* Must be callable from any thread, so can't use VMMR3CallR0. */
-    /** @todo Shouldn't we use NIL_VMCPUID here?  */
-    int rc = SUPR3CallVMMR0Ex(pVM->pVMR0, 0, VMMR0_DO_GMM_QUERY_HYPERVISOR_MEM_STATS, 0, &Req.Hdr);
+    int rc = SUPR3CallVMMR0Ex(pVM->pVMR0, NIL_VMCPUID, VMMR0_DO_GMM_QUERY_HYPERVISOR_MEM_STATS, 0, &Req.Hdr);
     if (rc == VINF_SUCCESS)
     {
Index: /trunk/src/VBox/VMM/PGMPhys.cpp
===================================================================
--- /trunk/src/VBox/VMM/PGMPhys.cpp	(revision 30343)
+++ /trunk/src/VBox/VMM/PGMPhys.cpp	(revision 30344)
@@ -3387,7 +3387,5 @@
 
     /* Must be callable from any thread, so can't use VMMR3CallR0. */
-    /** @todo r=bird: Why must it be a valid one? NIL_VMCPUID should do the
-     *        trick as it does a bunch of other places, shouldn't it? */
-    rc = SUPR3CallVMMR0Ex(pVM->pVMR0, 0 /* use CPU id 0; it must be a valid one */, VMMR0_DO_GMM_MAP_UNMAP_CHUNK, 0, &Req.Hdr);
+    rc = SUPR3CallVMMR0Ex(pVM->pVMR0, NIL_VMCPUID, VMMR0_DO_GMM_MAP_UNMAP_CHUNK, 0, &Req.Hdr);
     if (RT_SUCCESS(rc))
     {