Changeset 97004 in vbox

Timestamp:

Oct 5, 2022 1:17:28 PM (2 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Convered two HMEVENT stack variables into static const.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/VMXAllTemplate.cpp.h (modified) (5 diffs)
• VMMR0/HMVMXR0.cpp (modified) (2 diffs)
• include/HMVMXCommon.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -952 +952 @@
 }
 
-
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+
 /**
  * Loads the shadow VMCS specified by the VMCS info. object.
@@ -1117 +1117 @@
     return rc;
 }
+
 #endif /* VBOX_WITH_NESTED_HWVIRT_VMX */
-
-
 #ifdef VBOX_STRICT
+
 /**
  * Reads the VM-entry interruption-information field from the VMCS into the VMX
@@ -1161 +1161 @@
     AssertRC(rc);
 }
+
 #endif /* VBOX_STRICT */
-
 
 /**
@@ -4276 +4276 @@
                 if (uVector == X86_XCPT_GP)
                 {
-                    uint32_t const uXcptDfInfo = RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_VECTOR,         X86_XCPT_DF)
-                                               | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_TYPE,           VMX_ENTRY_INT_INFO_TYPE_HW_XCPT)
-                                               | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_ERR_CODE_VALID, 0)
-                                               | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_VALID,          1);
-                    HMEVENT EventXcptDf;
-                    RT_ZERO(EventXcptDf);
-                    EventXcptDf.u64IntInfo = uXcptDfInfo;
-                    return vmxHCInjectEventVmcs(pVCpu, pVmcsInfo, fIsNestedGuest, &EventXcptDf, fStepping, pfIntrState);
+                    static HMEVENT const s_EventXcptDf
+                        = HMEVENT_INIT_ONLY_INT_INFO(  RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_VECTOR, X86_XCPT_DF)
+                                                     | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_TYPE,   VMX_ENTRY_INT_INFO_TYPE_HW_XCPT)
+                                                     | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_ERR_CODE_VALID, 0)
+                                                     | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_VALID,          1));
+                    return vmxHCInjectEventVmcs(pVCpu, pVmcsInfo, fIsNestedGuest, &s_EventXcptDf, fStepping, pfIntrState);
                 }
 
@@ -4292 +4290 @@
                  * See Intel spec. 20.1.4 "Interrupt and Exception Handling"
                  */
-                uint32_t const uXcptGpInfo = RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_VECTOR,         X86_XCPT_GP)
-                                           | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_TYPE,           VMX_ENTRY_INT_INFO_TYPE_HW_XCPT)
-                                           | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_ERR_CODE_VALID, 0)
-                                           | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_VALID,          1);
-                HMEVENT EventXcptGp;
-                RT_ZERO(EventXcptGp);
-                EventXcptGp.u64IntInfo = uXcptGpInfo;
-                return vmxHCInjectEventVmcs(pVCpu, pVmcsInfo, fIsNestedGuest, &EventXcptGp, fStepping, pfIntrState);
+                static HMEVENT const s_EventXcptGp
+                    = HMEVENT_INIT_ONLY_INT_INFO(  RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_VECTOR, X86_XCPT_GP)
+                                                 | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_TYPE,   VMX_ENTRY_INT_INFO_TYPE_HW_XCPT)
+                                                 | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_ERR_CODE_VALID, 0)
+                                                 | RT_BF_MAKE(VMX_BF_ENTRY_INT_INFO_VALID,          1));
+                return vmxHCInjectEventVmcs(pVCpu, pVmcsInfo, fIsNestedGuest, &s_EventXcptGp, fStepping, pfIntrState);
             }
 

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

@@ -2244 +2244 @@
 }
 
-
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+
 /**
  * Sets up the shadow VMCS fields arrays.
@@ -2366 +2366 @@
     }
 }
+
 #endif /* VBOX_WITH_NESTED_HWVIRT_VMX */
-
 
 /**

trunk/src/VBox/VMM/include/HMVMXCommon.h

@@ -232 +232 @@
 AssertCompileSizeAlignment(HMEVENT, 8);
 
+/** Initializer for a HMEVENT structure with    */
+#define HMEVENT_INIT_ONLY_INT_INFO(a_uIntInfo) { 0, 0, 0, 0, (a_uIntInfo), 0 }
 
 /**