Changeset 96964 in vbox

Timestamp:

Oct 2, 2022 10:02:06 PM (2 years ago)

Author:

vboxsync

Message:

VMM/IEM: Some nits in the VMX code - no real code changes. bugref:10092

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp

@@ -7536 +7536 @@
 
 /**
- * Injects an event using TRPM given a VM-entry interruption info. and related
+ * Injects an event using TRPM given a VM-entry interruption info and related
  * fields.
  *
@@ -7574 +7574 @@
         Log(("%s: Injecting: fault_addr=%RGp\n", pszInstr, GCPtrFaultAddress));
     }
-    else
-    {
-        if (   uType == VMX_ENTRY_INT_INFO_TYPE_SW_INT
-            || uType == VMX_ENTRY_INT_INFO_TYPE_SW_XCPT
-            || uType == VMX_ENTRY_INT_INFO_TYPE_PRIV_SW_XCPT)
-        {
-            TRPMSetInstrLength(pVCpu, cbInstr);
-            Log(("%s: Injecting: instr_len=%u\n", pszInstr, cbInstr));
-        }
+    else if (   uType == VMX_ENTRY_INT_INFO_TYPE_SW_INT
+             || uType == VMX_ENTRY_INT_INFO_TYPE_SW_XCPT
+             || uType == VMX_ENTRY_INT_INFO_TYPE_PRIV_SW_XCPT)
+    {
+        TRPMSetInstrLength(pVCpu, cbInstr);
+        Log(("%s: Injecting: instr_len=%u\n", pszInstr, cbInstr));
     }
 
@@ -7634 +7631 @@
          * However, we do it here on VM-entry as well because while it isn't visible to guest
          * software until VM-exit, when and if HM looks at the VMCS to continue nested-guest
-         * execution using hardware-assisted VMX, it will not be try to inject the event again.
+         * execution using hardware-assisted VMX, it will not try to inject the event again.
          *
          * See Intel spec. 24.8.3 "VM-Entry Controls for Event Injection".
@@ -7726 +7723 @@
     Assert(   uInstrId == VMXINSTRID_VMLAUNCH
            || uInstrId == VMXINSTRID_VMRESUME);
-    const char *pszInstr = uInstrId == VMXINSTRID_VMRESUME ? "vmresume" : "vmlaunch";
+    const char * const pszInstr = uInstrId == VMXINSTRID_VMRESUME ? "vmresume" : "vmlaunch";
 
     /* Nested-guest intercept. */