Changeset 79116 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 13, 2019 5:22:14 AM (6 years ago)

Author:

vboxsync

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

131280

Message:

VMM/IEM: Nested VMX: bugref:9180 Use IEM_CPUMCTX_EXTRN_VMX_VMEXIT_MASK.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (1 diff)

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

@@ -2718 +2718 @@
     return VINF_EM_RAW_EMULATE_INSTR;
 # else
-    IEM_CTX_IMPORT_RET(pVCpu, CPUMCTX_EXTRN_CR0 | CPUMCTX_EXTRN_CR3 | CPUMCTX_EXTRN_CR4       /* Control registers */
-                            | CPUMCTX_EXTRN_DR7 | CPUMCTX_EXTRN_DR6                           /* Debug registers */
-                            | CPUMCTX_EXTRN_EFER                                              /* MSRs */
-                            | CPUMCTX_EXTRN_SYSENTER_MSRS
-                            | CPUMCTX_EXTRN_OTHER_MSRS    /* PAT */
-                            | CPUMCTX_EXTRN_RIP | CPUMCTX_EXTRN_RSP | CPUMCTX_EXTRN_RFLAGS    /* GPRs */
-                            | CPUMCTX_EXTRN_SREG_MASK                                         /* Segment registers */
-                            | CPUMCTX_EXTRN_TR                                                /* Task register */
-                            | CPUMCTX_EXTRN_LDTR | CPUMCTX_EXTRN_GDTR | CPUMCTX_EXTRN_IDTR    /* Table registers */
-                            | CPUMCTX_EXTRN_HWVIRT);                                          /* Hardware virtualization state */
-
     PVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
     Assert(pVmcs);
+
+    /* Import all the guest-CPU state required for the VM-exit. */
+    IEM_CTX_IMPORT_RET(pVCpu, IEM_CPUMCTX_EXTRN_VMX_VMEXIT_MASK);
 
     /* Ensure VM-entry interruption information valid bit isn't set. */