Changeset 103374 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 14, 2024 10:10:00 PM (11 months ago)

Author:

vboxsync

Message:

VMM/PGM,DBGF,GIC: Parfait pointed out some potential NULL pointer use here and there. bugref:3409

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• DBGFStack.cpp (modified) (2 diffs)
• VMM.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFStack.cpp

@@ -848 +848 @@
         else
         {
-            PVMCPU pVCpu = VMMGetCpuById(pUVM->pVM, idCpu);
-            CPUMMODE enmCpuMode = CPUMGetGuestMode(pVCpu);
+            PVMCPU const   pVCpu      = pUVM->pVM->apCpusR3[idCpu];
+            CPUMMODE const enmCpuMode = CPUMGetGuestMode(pVCpu);
             if (enmCpuMode == CPUMMODE_REAL)
             {
@@ -1029 +1029 @@
     {
         case DBGFCODETYPE_GUEST:
-            pCtx = CPUMQueryGuestCtxPtr(VMMGetCpuById(pVM, idCpu));
+            pCtx = CPUMQueryGuestCtxPtr(pVM->apCpusR3[idCpu]);
             hAs  = DBGF_AS_GLOBAL;
             break;
         case DBGFCODETYPE_HYPER:
-            pCtx = CPUMQueryGuestCtxPtr(VMMGetCpuById(pVM, idCpu));
+            pCtx = CPUMQueryGuestCtxPtr(pVM->apCpusR3[idCpu]);
             hAs  = DBGF_AS_RC_AND_GC_GLOBAL;
             break;

trunk/src/VBox/VMM/VMMR3/VMM.cpp

@@ -1296 +1296 @@
 
 #if defined(VBOX_VMM_TARGET_ARMV8)
+
 /**
  * VCPU worker for VMMR3CpuOn.
@@ -1306 +1307 @@
 static DECLCALLBACK(int) vmmR3CpuOn(PVM pVM, VMCPUID idCpu, RTGCPHYS GCPhysExecAddr, uint64_t u64CtxId)
 {
-    PVMCPU pVCpu = VMMGetCpuById(pVM, idCpu);
+    PVMCPU pVCpu = pVM->apCpusR3[idCpu];
     VMCPU_ASSERT_EMT(pVCpu);
 
@@ -1346 +1347 @@
     AssertRC(rc);
 }
-#else
+
+#else /* !VBOX_VMM_TARGET_ARMV8 */
+
 /**
  * VCPU worker for VMMR3SendStartupIpi.
@@ -1356 +1359 @@
 static DECLCALLBACK(int) vmmR3SendStartupIpi(PVM pVM, VMCPUID idCpu, uint32_t uVector)
 {
-    PVMCPU pVCpu = VMMGetCpuById(pVM, idCpu);
+    PVMCPU pVCpu = pVM->apCpusR3[idCpu];
     VMCPU_ASSERT_EMT(pVCpu);
 
@@ -1411 +1414 @@
 static DECLCALLBACK(int) vmmR3SendInitIpi(PVM pVM, VMCPUID idCpu)
 {
-    PVMCPU pVCpu = VMMGetCpuById(pVM, idCpu);
+    PVMCPU pVCpu = pVM->apCpusR3[idCpu];
     VMCPU_ASSERT_EMT(pVCpu);
 
@@ -1420 +1423 @@
 
     /* If the CPU is in VMX non-root mode, INIT signals cause VM-exits. */
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+# ifdef VBOX_WITH_NESTED_HWVIRT_VMX
     PCCPUMCTX pCtx = CPUMQueryGuestCtxPtr(pVCpu);
     if (CPUMIsGuestInVmxNonRootMode(pCtx))
         return VBOXSTRICTRC_TODO(IEMExecVmxVmexit(pVCpu, VMX_EXIT_INIT_SIGNAL, 0 /* uExitQual */));
-#endif
+# endif
 
     /** @todo Figure out how to handle a SVM nested-guest intercepts here for INIT
@@ -1431 +1434 @@
     PGMR3ResetCpu(pVM, pVCpu);
     PDMR3ResetCpu(pVCpu);   /* Only clears pending interrupts force flags */
-#if !defined(VBOX_VMM_TARGET_ARMV8)
+# if !defined(VBOX_VMM_TARGET_ARMV8)
     APICR3InitIpi(pVCpu);
-#endif
+# endif
     TRPMR3ResetCpu(pVCpu);
     CPUMR3ResetCpu(pVM, pVCpu);
@@ -1475 +1478 @@
     AssertRC(rc);
 }
-#endif
-
+
+#endif /* !VBOX_VMM_TARGET_ARMV8 */
 
 /**