Changeset 72875 in vbox

Timestamp:

Jul 4, 2018 2:08:27 PM (7 years ago)

Author:

vboxsync

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

123420

Message:

DBGFCpu: Make sure the CPU state we use is present in each of the APIs.

File:

• trunk/src/VBox/VMM/VMMR3/DBGFCpu.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFCpu.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_DBGF
+#define VMCPU_INCL_CPUM_GST_CTX /* For CPUM_IMPORT_EXTRN_RET(). */
 #include <VBox/vmm/dbgf.h>
 #include <VBox/vmm/cpum.h>
@@ -44 +45 @@
     Assert(idCpu == VMMGetCpuId(pVM));
     PVMCPU pVCpu = VMMGetCpuById(pVM, idCpu);
+    CPUM_IMPORT_EXTRN_RET(pVCpu, CPUMCTX_EXTRN_CR0 | CPUMCTX_EXTRN_EFER);
     *penmMode = CPUMGetGuestMode(pVCpu);
     return VINF_SUCCESS;
@@ -82 +84 @@
     Assert(idCpu == VMMGetCpuId(pVM));
     PVMCPU pVCpu = VMMGetCpuById(pVM, idCpu);
+    CPUM_IMPORT_EXTRN_RET(pVCpu, CPUMCTX_EXTRN_CS | CPUMCTX_EXTRN_EFER);
     *pfIn64BitCode = CPUMIsGuestIn64BitCode(pVCpu);
     return VINF_SUCCESS;
@@ -120 +123 @@
     Assert(idCpu == VMMGetCpuId(pVM));
     PVMCPU pVCpu = VMMGetCpuById(pVM, idCpu);
+    CPUM_IMPORT_EXTRN_RET(pVCpu, CPUMCTX_EXTRN_RFLAGS);
     *pfInV86Code = CPUMIsGuestInV86ModeEx(CPUMQueryGuestCtxPtr(pVCpu));
     return VINF_SUCCESS;