Changeset 31326 in vbox

Timestamp:

Aug 3, 2010 9:56:22 AM (14 years ago)

Author:

vboxsync

Message:

Pass on cpu priority property.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (2 diffs)
• include/VBox/vm.mac (modified) (1 diff)
• include/VBox/vmapi.h (modified) (1 diff)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (2 diffs)
• src/VBox/VMM/VM.cpp (modified) (5 diffs)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (2 diffs)

trunk/include/VBox/vm.h

@@ -705 +705 @@
     /** Number of virtual CPUs. */
     uint32_t                    cCpus;
+    /** CPU priority (1-100) */
+    uint32_t                    uCpuPriority;
 
     /** Size of the VM structure including the VMCPU array. */
@@ -713 +715 @@
 
     /** Reserved; alignment. */
-    uint32_t                    u32Reserved[6];
+    uint32_t                    u32Reserved[5];
 
     /** @name Public VMM Switcher APIs

trunk/include/VBox/vm.mac

@@ -53 +53 @@
     .hSelf                  resd 1
     .cCpus                  resd 1
+    .uCpuPriority           resd 1
     .cbSelf                 resd 1
     .offVMCPU               resd 1
-    .u32Reserved            resd 6
+    .u32Reserved            resd 5
 
     .pfnVMMGCGuestToHostAsmGuestCtx RTRCPTR_RES 1

trunk/include/VBox/vmapi.h

@@ -406 +406 @@
 VMMR3DECL(int)              VMR3HotUnplugCpu(PVM pVM, VMCPUID idCpu);
 VMMR3DECL(int)              VMR3HotPlugCpu(PVM pVM, VMCPUID idCpu);
-
+VMMR3DECL(int)              VMR3SetCpuPriority(PVM pVM, unsigned ulCpuPriority);
 /** @} */
 #endif /* IN_RING3 */

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -534 +534 @@
     hrc = pMachine->COMGETTER(CPUCount)(&cCpus);                                        H();
 
+    ULONG ulCpuPriority = 100;
+    hrc = pMachine->COMGETTER(CPUPriority)(&ulCpuPriority);                             H();
+
     Bstr osTypeId;
     hrc = pMachine->COMGETTER(OSTypeId)(osTypeId.asOutParam());                         H();
@@ -567 +570 @@
         InsertConfigInteger(pRoot, "RamHoleSize",          cbRamHole);
         InsertConfigInteger(pRoot, "NumCPUs",              cCpus);
+        InsertConfigInteger(pRoot, "CpuPriority",          ulCpuPriority);
         InsertConfigInteger(pRoot, "TimerMillies",         10);
 #ifdef VBOX_WITH_RAW_MODE

trunk/src/VBox/VMM/VM.cpp

@@ -561 +561 @@
         AssertRelease(pVM->pSession == pUVM->vm.s.pSession);
         AssertRelease(pVM->cCpus == cCpus);
+        AssertRelease(pVM->uCpuPriority == 100);
         AssertRelease(pVM->offVMCPU == RT_UOFFSETOF(VM, aCpus));
 
@@ -589 +590 @@
         if (RT_SUCCESS(rc))
         {
-            rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "HwVirtExtForced", &pVM->fHwVirtExtForced, false);
+            PCFGMNODE pRoot = CFGMR3GetRoot(pVM);
+            rc = CFGMR3QueryBoolDef(pRoot, "HwVirtExtForced", &pVM->fHwVirtExtForced, false);
             if (RT_SUCCESS(rc) && pVM->fHwVirtExtForced)
                 pVM->fHWACCMEnabled = true;
@@ -599 +601 @@
             if (psz && !strcmp(psz, "fake"))
             {
-                CFGMR3RemoveValue(CFGMR3GetRoot(pVM), "RawR3Enabled");
-                CFGMR3InsertInteger(CFGMR3GetRoot(pVM), "RawR3Enabled", 0);
-                CFGMR3RemoveValue(CFGMR3GetRoot(pVM), "RawR0Enabled");
-                CFGMR3InsertInteger(CFGMR3GetRoot(pVM), "RawR0Enabled", 0);
+                CFGMR3RemoveValue(pRoot, "RawR3Enabled");
+                CFGMR3InsertInteger(pRoot, "RawR3Enabled", 0);
+                CFGMR3RemoveValue(pRoot, "RawR0Enabled");
+                CFGMR3InsertInteger(pRoot, "RawR0Enabled", 0);
             }
 
@@ -611 +613 @@
             {
                 uint32_t cCPUsCfg;
-                rc = CFGMR3QueryU32Def(CFGMR3GetRoot(pVM), "NumCPUs", &cCPUsCfg, 1);
+                rc = CFGMR3QueryU32Def(pRoot, "NumCPUs", &cCPUsCfg, 1);
                 AssertLogRelMsgRC(rc, ("Configuration error: Querying \"NumCPUs\" as integer failed, rc=%Rrc\n", rc));
                 if (RT_SUCCESS(rc) && cCPUsCfg != cCpus)
@@ -622 +624 @@
             if (RT_SUCCESS(rc))
             {
+                rc = CFGMR3QueryU32Def(pRoot, "CpuPriority", &pVM->uCpuPriority, 100);
+                AssertLogRelMsgRC(rc, ("Configuration error: Querying \"CpuPriority\" as integer failed, rc=%Rrc\n", rc));
+
                 /*
                  * Init the ring-3 components and ring-3 per cpu data, finishing it off

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

@@ -588 +588 @@
                         pGVM->hSelf     = iHandle;
                         pGVM->pVM       = NULL;
-                        pGVM->cCpus     = cCpus;
+                        pGVM->cCpus     = cCpus;                        
 
                         gvmmR0InitPerVMData(pGVM);
@@ -607 +607 @@
                             PVM pVM = (PVM)RTR0MemObjAddress(pGVM->gvmm.s.VMMemObj); AssertPtr(pVM);
                             memset(pVM, 0, cPages << PAGE_SHIFT);
-                            pVM->enmVMState = VMSTATE_CREATING;
-                            pVM->pVMR0      = pVM;
-                            pVM->pSession   = pSession;
-                            pVM->hSelf      = iHandle;
-                            pVM->cbSelf     = cbVM;
-                            pVM->cCpus      = cCpus;
-                            pVM->offVMCPU   = RT_UOFFSETOF(VM, aCpus);
+                            pVM->enmVMState     = VMSTATE_CREATING;
+                            pVM->pVMR0          = pVM;
+                            pVM->pSession       = pSession;
+                            pVM->hSelf          = iHandle;
+                            pVM->cbSelf         = cbVM;
+                            pVM->cCpus          = cCpus;
+                            pVM->uCpuPriority   = 100; /* default is maximum priority. */
+                            pVM->offVMCPU       = RT_UOFFSETOF(VM, aCpus);
 
                             rc = RTR0MemObjAllocPage(&pGVM->gvmm.s.VMPagesMemObj, cPages * sizeof(SUPPAGE), false /* fExecutable */);