Changeset 19395 in vbox for trunk/include/VBox

Timestamp:

May 5, 2009 8:28:42 PM (16 years ago)

Author:

vboxsync

Message:

GVMM,VM: Register the other EMTs or we assert painfully in gvmmR0ByVMAndEMT. A couple of todos and stuff.

Location:

trunk/include/VBox

Files:

• gvm.h (modified) (2 diffs)
• gvmm.h (modified) (2 diffs)

trunk/include/VBox/gvm.h

@@ -42 +42 @@
 typedef struct GVMCPU
 {
-    /* VCPU id (0 - (pVM->cCPUs - 1) */
-    uint32_t        idCpu;
+    /** VCPU id (0 - (pVM->cCPUs - 1). */
+    VMCPUID         idCpu;
 
     /** Handle to the EMT thread. */
@@ -83 +83 @@
     /** The ring-0 mapping of the VM structure. */
     PVM             pVM;
-    /** Number of VCPUs (same as pVM->cCPUs) */
-    uint32_t        cCPUs;
+    /** Number of Virtual CPUs, i.e. how many entries there are in aCpus.
+     * Same same as PVM::cCPUs. */
+    uint32_t        cCpus;
     uint32_t        padding;
 

trunk/include/VBox/gvmm.h

@@ -125 +125 @@
 GVMMR0DECL(int)     GVMMR0QueryConfig(PSUPDRVSESSION pSession, const char *pszName, uint64_t *pu64Value);
 
-GVMMR0DECL(int)     GVMMR0CreateVM(PSUPDRVSESSION pSession, uint32_t cCPUs, PVM *ppVM);
+GVMMR0DECL(int)     GVMMR0CreateVM(PSUPDRVSESSION pSession, uint32_t cCpus, PVM *ppVM);
 GVMMR0DECL(int)     GVMMR0InitVM(PVM pVM);
 GVMMR0DECL(void)    GVMMR0DoneInitVM(PVM pVM);
 GVMMR0DECL(bool)    GVMMR0DoingTermVM(PVM pVM, PGVM pGVM);
 GVMMR0DECL(int)     GVMMR0DestroyVM(PVM pVM);
-GVMMR0DECL(int)     GVMMR0RegisterVCpu(PVM pVM, unsigned idCpu);
+GVMMR0DECL(int)     GVMMR0RegisterVCpu(PVM pVM, VMCPUID idCpu);
 GVMMR0DECL(PGVM)    GVMMR0ByHandle(uint32_t hGVM);
 GVMMR0DECL(PGVM)    GVMMR0ByVM(PVM pVM);
-GVMMR0DECL(int)     GVMMR0ByVMAndEMT(PVM pVM, unsigned idCpu, PGVM *ppGVM);
+GVMMR0DECL(int)     GVMMR0ByVMAndEMT(PVM pVM, VMCPUID idCpu, PGVM *ppGVM);
 GVMMR0DECL(PVM)     GVMMR0GetVMByHandle(uint32_t hGVM);
 GVMMR0DECL(PVM)     GVMMR0GetVMByEMT(RTNATIVETHREAD hEMT);
-GVMMR0DECL(int)     GVMMR0SchedHalt(PVM pVM, unsigned idCpu, uint64_t u64ExpireGipTime);
-GVMMR0DECL(int)     GVMMR0SchedWakeUp(PVM pVM, unsigned idCpu);
-GVMMR0DECL(int)     GVMMR0SchedPoll(PVM pVM, unsigned idCpu, bool fYield);
+GVMMR0DECL(int)     GVMMR0SchedHalt(PVM pVM, VMCPUID idCpu, uint64_t u64ExpireGipTime);
+GVMMR0DECL(int)     GVMMR0SchedWakeUp(PVM pVM, VMCPUID idCpu);
+GVMMR0DECL(int)     GVMMR0SchedPoll(PVM pVM, VMCPUID idCpu, bool fYield);
 GVMMR0DECL(int)     GVMMR0QueryStatistics(PGVMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM);
 GVMMR0DECL(int)     GVMMR0ResetStatistics(PCGVMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM);
@@ -153 +153 @@
     PSUPDRVSESSION  pSession;
     /** Number of virtual CPUs for the new VM. (IN) */
-    uint32_t        cCPUs;
+    uint32_t        cCpus;
     /** Pointer to the ring-3 mapping of the shared VM structure on return. (OUT) */
     PVMR3           pVMR3;