Changeset 13751 in vbox for trunk

Timestamp:

Nov 3, 2008 2:53:11 PM (16 years ago)

Author:

vboxsync

Message:

UVM updates

Location:

trunk

Files:

• include/VBox/uvm.h (modified) (2 diffs)
• include/VBox/vm.h (modified) (6 diffs)
• src/VBox/VMM/MMHyper.cpp (modified) (3 diffs)
• src/VBox/VMM/VM.cpp (modified) (6 diffs)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (2 diffs)
• src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (1 diff)

trunk/include/VBox/uvm.h

@@ -35 +35 @@
 
 #include <VBox/types.h>
+
+/**
+ * Per virtual CPU ring-3 (user mode) data.
+ */
+typedef struct UVMCPU
+{
+    uint32_t     uFiller;
+} UVMCPU;
 
 /**
@@ -94 +102 @@
     } stam;
 
+    /* Per virtual CPU data. */
+    UVMCPU                      aCpu[1];
 } UVM;
 

trunk/include/VBox/vm.h

@@ -93 +93 @@
     PVMRC                   pVMRC;
     /** The CPU ID.
-     * This is the index into the VM::aCpus array. */
+     * This is the index into the VM::aCpu array. */
     VMCPUID                 idCpu;
     /** The ring-3 thread handle of the emulation thread for this CPU.
@@ -283 +283 @@
  */
 #ifdef VBOX_WITH_SMP_GUESTS
-# define VMCPU_FF_SET(pVM, idCpu, fFlag)    ASMAtomicOrU32(&(pVM)->aCpus[idCpu].fForcedActions, (fFlag))
+# define VMCPU_FF_SET(pVM, idCpu, fFlag)    ASMAtomicOrU32(&(pVM)->aCpu[idCpu].fForcedActions, (fFlag))
 #else
 # define VMCPU_FF_SET(pVM, idCpu, fFlag)    VM_FF_SET(pVM, fFlag)
@@ -311 +311 @@
  */
 #ifdef VBOX_WITH_SMP_GUESTS
-# define VMCPU_FF_CLEAR(pVM, idCpu, fFlag)  ASMAtomicAndU32(&(pVM)->aCpus[idCpu].fForcedActions, ~(fFlag))
+# define VMCPU_FF_CLEAR(pVM, idCpu, fFlag)  ASMAtomicAndU32(&(pVM)->aCpu[idCpu].fForcedActions, ~(fFlag))
 #else
 # define VMCPU_FF_CLEAR(pVM, idCpu, fFlag)  VM_FF_CLEAR(pVM, fFlag)
@@ -332 +332 @@
  */
 #ifdef VBOX_WITH_SMP_GUESTS
-# define VMCPU_FF_ISSET(pVM, idCpu, fFlag)  (((pVM)->aCpus[idCpu].fForcedActions & (fFlag)) == (fFlag))
+# define VMCPU_FF_ISSET(pVM, idCpu, fFlag)  (((pVM)->aCpu[idCpu].fForcedActions & (fFlag)) == (fFlag))
 #else
 # define VMCPU_FF_ISSET(pVM, idCpu, fFlag)  VM_FF_ISSET(pVM, fFlag)
@@ -353 +353 @@
  */
 #ifdef VBOX_WITH_SMP_GUESTS
-# define VMCPU_FF_ISPENDING(pVM, idCpu, fFlags) ((pVM)->aCpus[idCpu].fForcedActions & (fFlags))
+# define VMCPU_FF_ISPENDING(pVM, idCpu, fFlags) ((pVM)->aCpu[idCpu].fForcedActions & (fFlags))
 #else
 # define VMCPU_FF_ISPENDING(pVM, idCpu, fFlags) VM_FF_ISPENDING(pVM, fFlags)
@@ -775 +775 @@
 
     /** VMCPU array for the configured number of virtual CPUs. */
-    VMCPU       aCpus[1];
+    VMCPU       aCpu[1];
 } VM;
 

trunk/src/VBox/VMM/MMHyper.cpp

@@ -105 +105 @@
          * Map the VM structure into the hypervisor space.
          */
-        AssertRelease(pVM->cbSelf == RT_OFFSETOF(VM, aCpus[pVM->cCPUs]));
+        AssertRelease(pVM->cbSelf == RT_OFFSETOF(VM, aCpu[pVM->cCPUs]));
 
         RTGCPTR GCPtr;
@@ -114 +114 @@
             pVM->pVMGC = pVM->pVMRC;
             for (uint32_t i = 0; i < pVM->cCPUs; i++)
-                pVM->aCpus[i].pVMRC = pVM->pVMRC;
+                pVM->aCpu[i].pVMRC = pVM->pVMRC;
 
             /* Reserve a page for fencing. */
@@ -293 +293 @@
             pVM->pVMGC                          = pVM->pVMRC;
             for (uint32_t i = 0; i < pVM->cCPUs; i++)
-                pVM->aCpus[i].pVMRC             = pVM->pVMRC;
+                pVM->aCpu[i].pVMRC             = pVM->pVMRC;
 
             pVM->mm.s.pvHyperAreaGC             += offDelta;

trunk/src/VBox/VMM/VM.cpp

@@ -124 +124 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static int               vmR3CreateUVM(PUVM *ppUVM);
+static int               vmR3CreateUVM(uint32_t cCPUs, PUVM *ppUVM);
 static int               vmR3CreateU(PUVM pUVM, uint32_t cCPUs, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUserCFGM);
 static int               vmR3InitRing3(PVM pVM, PUVM pUVM);
@@ -212 +212 @@
      */
     PUVM pUVM;
-    int rc = vmR3CreateUVM(&pUVM);
+    int rc = vmR3CreateUVM(cCPUs, &pUVM);
     if (RT_FAILURE(rc))
         return rc;
@@ -363 +363 @@
  *
  * @returns VBox status code.
+ * @param   cCPUs   Number of virtual CPUs
  * @param   ppUVM   Where to store the UVM pointer.
  */
-static int vmR3CreateUVM(PUVM *ppUVM)
+static int vmR3CreateUVM(uint32_t cCPUs, PUVM *ppUVM)
 {
     /*
@@ -371 +372 @@
      * and start the emulation thread (EMT).
      */
-    PUVM pUVM = (PUVM)RTMemAllocZ(sizeof(*pUVM));
+    PUVM pUVM = (PUVM)RTMemAllocZ(RT_OFFSETOF(UVM, aCpu[cCPUs]));
     AssertReturn(pUVM, VERR_NO_MEMORY);
     pUVM->u32Magic = UVM_MAGIC;
@@ -463 +464 @@
          */
         pVM->pUVM = pUVM;
-        pVM->ThreadEMT = pVM->aCpus[0].hThreadR3 = pUVM->vm.s.ThreadEMT;
-        pVM->NativeThreadEMT = pVM->aCpus[0].hNativeThreadR3 = pUVM->vm.s.NativeThreadEMT;
+        pVM->ThreadEMT = pVM->aCpu[0].hThreadR3 = pUVM->vm.s.ThreadEMT;
+        pVM->NativeThreadEMT = pVM->aCpu[0].hNativeThreadR3 = pUVM->vm.s.NativeThreadEMT;
 
         /*
@@ -485 +486 @@
 
             /* Calculate the offset to the VMCPU array. */
-            pVM->offVMCPU = RT_OFFSETOF(VM, aCpus);
+            pVM->offVMCPU = RT_OFFSETOF(VM, aCpu);
 
             /* Make sure the CPU count in the config data matches. */

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

@@ -575 +575 @@
                          * Allocate the shared VM structure and associated page array.
                          */
-                        const size_t cbVM   = RT_OFFSETOF(VM, aCpus[cCPUs]);
+                        const size_t cbVM   = RT_OFFSETOF(VM, aCpu[cCPUs]);
                         const size_t cPages = RT_ALIGN(cbVM, PAGE_SIZE) >> PAGE_SHIFT;
                         rc = RTR0MemObjAllocLow(&pGVM->gvmm.s.VMMemObj, cPages << PAGE_SHIFT, false /* fExecutable */);
@@ -612 +612 @@
                                     for (unsigned i=0;i<cCPUs;i++)
                                     {
-                                        pVM->aCpus[i].pVMR0 = pVM;
-                                        pVM->aCpus[i].pVMR3 = pVM->pVMR3;
+                                        pVM->aCpu[i].pVMR0 = pVM;
+                                        pVM->aCpu[i].pVMR3 = pVM->pVMR3;
                                     }
 

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

@@ -173 +173 @@
     CHECK_MEMBER_ALIGNMENT(VM, rem.s.StatsInQEMU, 8);
     CHECK_MEMBER_ALIGNMENT(VM, rem.s.Env, 32);
-    CHECK_MEMBER_ALIGNMENT(VM, aCpus, 64);
+    CHECK_MEMBER_ALIGNMENT(VM, aCpu, 64);
 
     /* vmcpu */