Changeset 19385 in vbox

Timestamp:

May 5, 2009 3:43:14 PM (16 years ago)

Author:

vboxsync

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

46891

Message:

GVMMR0RegisterVCpu: use gvmmR0ByVM instead of gvmmR0ByVMAndEMT as we're not EMT0 (still untested).

File:

• trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -1054 +1054 @@
 }
 
-/**
- * Register a new VCPU EMT thread (VCPU 0 is automatically registered during VM creation)
+
+/**
+ * Registers the calling thread as the EMT of a Virtual CPU.
+ *
+ * Note that VCPU 0 is automatically registered during VM creation.
  *
  * @returns VBox status code
  * @param   pVM             The shared VM structure (the ring-0 mapping).
- * @param   idCpu           VCPU id
+ * @param   idCpu           VCPU id.
  */
 GVMMR0DECL(int) GVMMR0RegisterVCpu(PVM pVM, unsigned idCpu)
 {
-    AssertReturn(idCpu < pVM->cCPUs, VERR_INVALID_CPU_ID);
+    AssertReturn(idCpu != 0, VERR_NOT_OWNER);
 
     /*
      * Validate the VM structure, state and handle.
      */
-    PGVMM   pGVMM;
-    PGVM    pGVM;
-    PGVMCPU pCurGVCpu;
-
-    int rc = gvmmR0ByVMAndEMT(pVM, idCpu, &pGVM, &pGVMM);
+    PGVM pGVM;
+    PGVMM pGVMM;
+    int rc = gvmmR0ByVM(pVM, &pGVM, &pGVMM, false /* fTakeUsedLock */);
     if (RT_FAILURE(rc))
         return rc;
 
-    AssertReturn(!pGVM->aCpus[idCpu].hEMT, VERR_ACCESS_DENIED);
+    AssertReturn(idCpu < pVM->cCPUs, VERR_INVALID_CPU_ID);
+    AssertReturn(pGVM->aCpus[idCpu].hEMT == NIL_RTNATIVETHREAD, VERR_ACCESS_DENIED);
 
     pGVM->aCpus[idCpu].hEMT = RTThreadNativeSelf();
     return VINF_SUCCESS;
 }
+
 
 /**