Changeset 75940 in vbox for trunk/include/VBox/vmm

Timestamp:

Dec 4, 2018 10:42:07 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Pending guest debug exception injection.

File:

• trunk/include/VBox/vmm/hm_vmx.h (modified) (2 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -4195 +4195 @@
  *
  * @returns @c true if the VM-entry is vectoring, @c false otherwise.
- * @param   uEntryIntInfo   The VM-entry interruption information field.
- */
-DECLINLINE(bool) HMVmxIsVmentryVectoring(uint32_t uEntryIntInfo)
-{
+ * @param   uEntryIntInfo       The VM-entry interruption information field.
+ * @param   pEntryIntInfoType   The VM-entry interruption information type field.
+ *                              Optional, can be NULL. Only updated when this
+ *                              function returns @c true.
+ */
+DECLINLINE(bool) HMVmxIsVmentryVectoring(uint32_t uEntryIntInfo, uint8_t *pEntryIntInfoType)
+{
+    /*
+     * The definition of what is a vectoring VM-entry is taken
+     * from Intel spec. 26.6 "Special Features of VM Entry".
+     */
     if (!VMX_ENTRY_INT_INFO_IS_VALID(uEntryIntInfo))
         return false;
-    switch (VMX_ENTRY_INT_INFO_TYPE(uEntryIntInfo))
+    uint8_t const uType = VMX_ENTRY_INT_INFO_TYPE(uEntryIntInfo);
+    switch (uType)
     {
         case VMX_ENTRY_INT_INFO_TYPE_EXT_INT:
@@ -4209 +4217 @@
         case VMX_ENTRY_INT_INFO_TYPE_PRIV_SW_XCPT:
         case VMX_ENTRY_INT_INFO_TYPE_SW_XCPT:
+        {
+            if (pEntryIntInfoType)
+                *pEntryIntInfoType = uType;
             return true;
+        }
     }
     return false;