Changeset 13742

Timestamp:

11/03/08 13:19:40 (2 months ago)

Author:

vboxsync

Message:

Some initial VM data restructuring.

Files:

• trunk/include/VBox/gvmm.h (modified) (2 diffs)
• trunk/include/VBox/vm.h (modified) (4 diffs)
• trunk/include/VBox/vm.mac (modified) (1 diff)
• trunk/include/VBox/vmapi.h (modified) (1 diff)
• trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp (modified) (1 diff)
• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/CPUMInternal.h (modified) (2 diffs)
• trunk/src/VBox/VMM/EMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/HWACCMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/PGMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/TMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/VM.cpp (modified) (7 diffs)
• trunk/src/VBox/VMM/VMM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMInternal.h (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/testcase/tstAnimate.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/tstMicro.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/tstVMM-2.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/tstVMM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/tstVMMFork.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/tstVMREQ.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (1 diff)

trunk/include/VBox/gvmm.h

@@ -125 +125 @@
-GVMMR0DECL(int)     GVMMR0QueryConfig(PSUPDRVSESSION pSession, const char *pszName, uint64_t *pu64Value);
-
-
+uint32_t cCPUs, 
-GVMMR0DECL(int)     GVMMR0InitVM(PVM pVM);
-GVMMR0DECL(int)     GVMMR0DestroyVM(PVM pVM);
@@ -149 +149 @@
-    /** The support driver session. (IN) */
-    PSUPDRVSESSION  pSession;
+    /** Number of virtual CPUs for the new VM. (IN) */
+    uint32_t        cCPUs;
-    /** Pointer to the ring-3 mapping of the shared VM structure on return. (OUT) */
-    PVMR3           pVMR3;

trunk/include/VBox/vm.h

@@ -43 +43 @@
- */
-
+
+#define VMCPU_MAX_CPU_COUNT    255
-
-/**
@@ -80 +82 @@
-    /** Per CPU forced action.
-     * See the VMCPU_FF_* \#defines. Updated atomically. */
-
+    
-    /** The CPU state. */
-
+    
-
-    /** Ring-3 Host Context VM Pointer. */
-
+    
-    /** Ring-0 Host Context VM Pointer. */
-
+    
-    /** Raw-mode Context VM Pointer. */
-
+    
-    /** The CPU ID.
-     * This is the index into the VM::aCpus array. */
-
+    
-    /** The ring-3 thread handle of the emulation thread for this CPU.
-     * @todo Use the VM_IS_EMT() macro to check if executing in EMT? */
-
+    
-    /** The native ring-3 handle. */
-
+    
-    /** The native ring-0 handle. */
-
-
-r
-
+    
+
+
+    
-
-    /** CPUM part. */
-    union
-    {
- 0 /*def ___CPUMInternal_h */
-VMCPUCPUM
-
-64];
+def ___CPUMInternal_h
+CPUMCPU  
+
+4096];      /* multiple of 32 */
-    } cpum;
+    /** VMM part. */
+    union
+    {
+#ifdef ___VMMInternal_h
+        struct VMMCPU       s;
+#endif
+        char                padding[32];        /* multiple of 32 */
+    } vmm;
+
+    /** PGM part. */
+    union
+    {
+#ifdef ___PGMInternal_h
+        struct PGMCPU       s;
+#endif
+        char                padding[32];        /* multiple of 32 */
+    } pgm;
+
+    /** HWACCM part. */
+    union
+    {
+#ifdef ___HWACCMInternal_h
+        struct HWACCMCPU    s;
+#endif
+        char                padding[32];        /* multiple of 32 */
+    } hwaccm;
+
+    /** EM part. */
+    union
+    {
+#ifdef ___EMInternal_h
+        struct EMCPU        s;
+#endif
+        char                padding[32];        /* multiple of 32 */
+    } em;
+
+    /** TM part. */
+    union
+    {
+#ifdef ___TMInternal_h
+        struct TMCPU        s;
+#endif
+        char                padding[32];        /* multiple of 32 */
+    } tm;
-} VMCPU;
-
+/** Pointer to a VMCPU. */
+#ifndef ___VBox_types_h
+typedef struct VMCPU *PVMCPU;
+#endif
-
-/** The name of the Guest Context VMM Core module. */
@@ -416 +466 @@
-    /** Number of virtual CPUs. */
-    uint32_t                    cCPUs;
+
+    /** Offset to the VMCPU array starting from beginning of this structure. */
+    uint32_t                    offVMCPU;
+
-    /** Reserved; alignment. */
-7
+6
-
-    /** @name Public VMM Switcher APIs
@@ -715 +769 @@
-
-    /** Padding for aligning the cpu array on a 64 byte boundrary. */
-
-
-
-
-
-
+
+
+
+
-} VM;
-

trunk/include/VBox/vm.mac

@@ -58 +58 @@
-    .hSelf              resd 1
-    .cCPUs              resd 1
-
+
+
-
-    .pfnVMMGCGuestToHostAsmGuestCtx RTGCPTR32_RES 1

trunk/include/VBox/vmapi.h

@@ -342 +342 @@
-
-
-
+uint32_t cCPUs, 
-VMMR3DECL(int)  VMR3PowerOn(PVM pVM);
-VMMR3DECL(int)  VMR3Suspend(PVM pVM);

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -1167 +1167 @@
-     * Create empty VM.
-     */
-
+1, 
-    if (VBOX_FAILURE(rc))
-    {

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -6610 +6610 @@
-#endif /* VBOX_WITH_VRDP */
-
+        ULONG cCpus = 1;
+#ifdef VBOX_WITH_SMP_GUESTS
+        pMachine->COMGETTER(CPUCount)(&cCpus);
+#endif
+
-        /*
-         * Create the VM
@@ -6620 +6625 @@
-        alock.leave();
-
-
+cCpus, 
-                          task->mConfigConstructor, static_cast <Console *> (console),
-                          &pVM);

trunk/src/VBox/VMM/CPUMInternal.h

@@ -268 +268 @@
-    CPUMCTX                 Guest;
-
-
-    /** Pointer to the current hypervisor core context - R3Ptr. */
-    R3PTRTYPE(PCPUMCTXCORE) pHyperCoreR3;
-3
+0
-    R0PTRTYPE(PCPUMCTXCORE) pHyperCoreR0;
-    /** Pointer to the current hypervisor core context - RCPtr. */
@@ -345 +344 @@
-typedef CPUM *PCPUM;
-
+/**
+ * CPUM Data (part of VMCPU)
+ */
+typedef struct CPUMCPU
+{
+    /**
+     * Guest context.
+     * Aligned on a 64-byte boundrary.
+     */
+    CPUMCTX                 Guest;
+} CPUMCPU;
+/** Pointer to the CPUMCPU instance data residing in the shared VMCPU structure. */
+typedef CPUMCPU *PCPUMCPU;
+
-__BEGIN_DECLS
-

trunk/src/VBox/VMM/EMInternal.h

@@ -371 +371 @@
-
-
+/**
+ * EM VMCPU Instance data.
+ */
+typedef struct EMCPU
+{
+    /** Offset to the VM structure.
+     * See EMCPU2VM(). */
+    RTUINT                  offVMCPU;
+} EMCPU;
+/** Pointer to EM VM instance data. */
+typedef EMCPU *PEMCPU;
-
-/** @} */

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -506 +506 @@
-typedef HWACCM *PHWACCM;
-
+/**
+ * HWACCM VMCPU Instance data.
+ */
+typedef struct HWACCMCPU
+{
+    /** Offset to the VM structure.
+     * See HWACCMCPU2VM(). */
+    RTUINT                      offVMCPU;
+} HWACCMCPU;
+/** Pointer to HWACCM VM instance data. */
+typedef HWACCMCPU *PHWACCMCPU;
+
+
-#ifdef IN_RING0
-

trunk/src/VBox/VMM/PGMInternal.h

@@ -2611 +2611 @@
-
-
+/**
+ * PGMCPU Data (part of VMCPU)
+ */
+typedef struct PGMCPU
+{
+    /** Offset to the VMCPU structure. */
+    RTINT                           offVMCPU;
+} PGMCPU, *PPGMCPU;
+
-/** @name PGM::fSyncFlags Flags
- * @{

trunk/src/VBox/VMM/TMInternal.h

@@ -499 +499 @@
-typedef TM *PTM;
-
+/**
+ * TM VMCPU Instance data.
+ * Changes to this must checked against the padding of the tm union in VM!
+ */
+typedef struct TMCPU
+{
+    /** Offset to the VMCPU structure.
+     * See TMCPU2VM(). */
+    RTUINT                      offVMCPU;
+} TMCPU;
+/** Pointer to TM VMCPU instance data. */
+typedef TMCPU *PTMCPU;
-
-const char             *tmTimerState(TMTIMERSTATE enmState);

trunk/src/VBox/VMM/VM.cpp

@@ -125 +125 @@
-*******************************************************************************/
-static int               vmR3CreateUVM(PUVM *ppUVM);
-
+uint32_t cCPUs, 
-static int               vmR3InitRing3(PVM pVM, PUVM pUVM);
-static int               vmR3InitRing0(PVM pVM);
@@ -180 +180 @@
- * @returns 0 on success.
- * @returns VBox error code on failure.
+ * @param   cCPUs               Number of virtual CPUs for the new VM.
- * @param   pfnVMAtError        Pointer to callback function for setting VM errors.
- *                              This is called in the EM.
@@ -188 +189 @@
- * @param   ppVM                Where to store the 'handle' of the created VM.
- */
-
-
-pfnVMAtError=%p pvUserVM=%p  pfnCFGMConstructor=%p pvUserCFGM=%p ppVM=%p\n"
+uint32_t cCPUs, 
+
+cCPUs=%d pfnVMAtError=%p pvUserVM=%p  pfnCFGMConstructor=%p pvUserCFGM=%p ppVM=%p\n", cCPUs
-
-    /*
@@ -229 +230 @@
-            PVMREQ pReq;
-            rc = VMR3ReqCallU(pUVM, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)vmR3CreateU,
-3, pUVM
+4, pUVM, cCPUs
-            if (RT_SUCCESS(rc))
-            {
@@ -422 +423 @@
- * @thread EMT
- */
-
+uint32_t cCPUs, 
-{
-    int rc = VINF_SUCCESS;
@@ -448 +449 @@
-    CreateVMReq.pVMR0 = NIL_RTR0PTR;
-    CreateVMReq.pVMR3 = NULL;
+    CreateVMReq.cCPUs = cCPUs;
-    rc = SUPCallVMMR0Ex(NIL_RTR0PTR, VMMR0_DO_GVMM_CREATE_VM, 0, &CreateVMReq.Hdr);
-    if (RT_SUCCESS(rc))
@@ -483 +485 @@
-            }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-                VMR3Relocate(pVM, 0);
-                LogFlow(("Ring-3 init succeeded\n"));
-
-                /*
-0 components
+3 components and do a round of relocations with 0 delta
-                 */
-0(p
+3(pVM, pU
-                if (VBOX_SUCCESS(rc))
-                {
-                    /* Relocate again, because some switcher fixups depends on R0 init results. */
-                    VMR3Relocate(pVM, 0);
+                    LogFlow(("Ring-3 init succeeded\n"));
+
+                    /*
+                     * Init the Ring-0 components.
+                     */
+                    rc = vmR3InitRing0(pVM);
+                    if (VBOX_SUCCESS(rc))
+                    {
+                        /* Relocate again, because some switcher fixups depends on R0 init results. */
+                        VMR3Relocate(pVM, 0);
-
-#ifdef VBOX_WITH_DEBUGGER
-
-
-
-
-
-
-
-
-
-
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
-#endif
-                        /*
-                         * Init the Guest Context components.
-                         */
-                        rc = vmR3InitGC(pVM);
-                        if (VBOX_SUCCESS(rc))
-                        {
-                            /*
- * Now we can safely set the VM halt method to default
- 
-SetHaltMethodU(pUVM, VMHALTMETHOD_DEFAULT
-RT
+* Init the Guest Context components
+
+InitGC(pVM
+VBOX
-                            {
-                                /*
-Set the state and link into the global lis
+Now we can safely set the VM halt method to defaul
-                                 */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                            }
+#ifdef VBOX_WITH_DEBUGGER
+                            DBGCTcpTerminate(pVM, pUVM->vm.s.pvDBGC);
+                            pUVM->vm.s.pvDBGC = NULL;
-                        }
-
-
-
+
+
-                    }
-
-
+
-                }
-                vmR3Destroy(pVM);
-            }
-            //..

trunk/src/VBox/VMM/VMM.cpp

@@ -178 +178 @@
-    /* GC switchers are enabled by default. Turned off by HWACCM. */
-    pVM->vmm.s.fSwitcherDisabled = false;
-
-    /* Get the CPU count.*/
-    rc = CFGMR3QueryU32Def(CFGMR3GetRoot(pVM), "NumCPUs", &pVM->cCPUs, 1);
-    AssertLogRelMsgRCReturn(rc, ("Configuration error: Querying \"NumCPUs\" as integer failed, rc=%Vrc\n", rc), rc);
-#ifdef VBOX_WITH_SMP_GUESTS
-    AssertLogRelMsgReturn(pVM->cCPUs > 0 && pVM->cCPUs <= 256,
-                          ("Configuration error: \"NumCPUs\"=%RU32 is out of range [1..256]\n", pVM->cCPUs), VERR_INVALID_PARAMETER);
-#else
-    AssertLogRelMsgReturn(pVM->cCPUs != 0,
-                          ("Configuration error: \"NumCPUs\"=%RU32, expected 1\n", pVM->cCPUs), VERR_INVALID_PARAMETER);
-#endif
-
-#ifdef VBOX_WITH_SMP_GUESTS
-    LogRel(("[SMP] VMM with %RU32 CPUs\n", pVM->cCPUs));
-#endif
-
-    /*

trunk/src/VBox/VMM/VMMInternal.h

@@ -157 +157 @@
-
-/**
-M
+
- */
-typedef struct VMM
@@ -351 +351 @@
-typedef VMM *PVMM;
-
+/**
+ * VMMCPU Data (part of VMCPU)
+ */
+typedef struct VMMCPU
+{
+    /** Offset to the VMCPU structure.
+     * See VMM2VMCPU(). */
+    RTINT                       offVMCPU;
+} VMMCPU;
+/** Pointer to VMMCPU. */
+typedef VMMCPU *PVMMCPU;
+
-
-/**

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

@@ -470 +470 @@
-    if (!VALID_PTR(pReq->pSession))
-        return VERR_INVALID_POINTER;
+    if (    pReq->cCPUs == 0
+        ||  pReq->cCPUs > VMCPU_MAX_CPU_COUNT)
+        return VERR_INVALID_PARAMETER;
-
-    /*
@@ -477 +480 @@
-    pReq->pVMR0 = NULL;
-    pReq->pVMR3 = NIL_RTR3PTR;
-
+pReq->cCPUs, 
-    if (RT_SUCCESS(rc))
-    {
@@ -494 +497 @@
- * @returns VBox status code.
- * @param   pSession    The support driver session.
+ * @param   cCPUs       Number of virtual CPUs for the new VM.
- * @param   ppVM        Where to store the pointer to the VM structure.
- *
- * @thread  EMT.
- */
-
+uint32_t cCPUs, 
-{
-    LogFlow(("GVMMR0CreateVM: pSession=%p\n", pSession));
@@ -571 +575 @@
-                         * Allocate the shared VM structure and associated page array.
-                         */
-
+ + sizeof(VMCPU) * (cCPUs - 1)
-                        rc = RTR0MemObjAllocLow(&pGVM->gvmm.s.VMMemObj, cPages << PAGE_SHIFT, false /* fExecutable */);
-                        if (RT_SUCCESS(rc))

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

@@ -828 +828 @@
-     */
-    PVM pVM;
-
+1, 
-    if (VBOX_SUCCESS(rc))
-    {

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

@@ -347 +347 @@
-     */
-    PVM pVM;
-
+1, 
-    if (VBOX_SUCCESS(rc))
-    {

trunk/src/VBox/VMM/testcase/tstVMM-2.cpp

@@ -354 +354 @@
-     */
-    PVM pVM;
-
+1, 
-    if (VBOX_SUCCESS(rc))
-    {

trunk/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp

@@ -86 +86 @@
-    RTPrintf(TESTCASE ": Initializing...\n");
-    PVM pVM;
-
+1, 
-    if (VBOX_SUCCESS(rc))
-    {

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

@@ -54 +54 @@
-    RTPrintf(TESTCASE ": Initializing...\n");
-    PVM pVM;
-
+1, 
-    if (VBOX_SUCCESS(rc))
-    {

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

@@ -71 +71 @@
-    RTPrintf(TESTCASE ": Initializing...\n");
-    PVM pVM;
-
+1, 
-    if (VBOX_SUCCESS(rc))
-    {

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

@@ -226 +226 @@
-     */
-    PVM pVM;
-
+1, 
-    if (VBOX_SUCCESS(rc))
-    {

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

@@ -177 +177 @@
-    /* vmcpu */
-    CHECK_MEMBER_ALIGNMENT(VMCPU, cpum, 64);
-
+
+
+
+
+
+
-
-    /* cpumctx */