Changeset 79030 in vbox

Timestamp:

Jun 7, 2019 5:47:07 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131187

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Name the exit qualification field as it is in the VT-x spec.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (6 diffs)

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

@@ -1107 +1107 @@
 
 /**
- * Reads the VM-exit Qualification from the VMCS into the VMX transient structure.
+ * Reads the Exit Qualification from the VMCS into the VMX transient structure.
  *
  * @returns VBox status code.
@@ -6850 +6850 @@
  * Decodes the memory operand of an instruction that caused a VM-exit.
  *
- * The VM-exit qualification field provides the displacement field for memory
+ * The Exit qualification field provides the displacement field for memory
  * operand instructions, if any.
  *
@@ -7718 +7718 @@
                     /*
                      * VM-entry can fail due to invalid-guest state, machine-check events and
-                     * MSR loading failures. Other than VM-exit reason and VM-exit qualification
+                     * MSR loading failures. Other than VM-exit reason and Exit qualification
                      * all other VMCS fields are left unmodified on VM-entry failure.
                      *
@@ -12658 +12658 @@
          *   - Provides VM-exit instruction length.
          *   - Provides VM-exit information.
-         *   - Optionally provides VM-exit qualification.
+         *   - Optionally provides Exit qualification.
          *
-         * Since VM-exit qualification is 0 for all VM-exits where it is not
+         * Since Exit qualification is 0 for all VM-exits where it is not
          * applicable, reading and passing it to the guest should produce
          * defined behavior.
@@ -14921 +14921 @@
 
     /*
-     * Get the DR6-like values from the VM-exit qualification and pass it to DBGF
-     * for processing.
+     * Get the DR6-like values from the Exit qualification and pass it to DBGF for processing.
      */
     int rc = hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
@@ -15865 +15864 @@
                 return IEMExecVmxVmexitXcpt(pVCpu, &ExitInfo, &ExitEventInfo);
             }
+
+            /* Nested paging is currently a requirement, otherwise we would need to handle shadow #PFs. */
+            Assert(pVCpu->CTX_SUFF(pVM)->hm.s.fNestedPaging);
 
             /* If the guest hypervisor is not intercepting the exception, forward it to the guest. */