Changeset 71342 in vbox for trunk/src/VBox

Timestamp:

Mar 15, 2018 6:20:51 AM (7 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Include GIF as part of nested hw.virt CPUM info.

File:

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

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

@@ -2398 +2398 @@
 #define CPUMHWVIRTDUMP_COMMON   RT_BIT(2)
 #define CPUMHWVIRTDUMP_LAST     CPUMHWVIRTDUMP_VMX
-#define CPUMHWVIRTDUMP_ALL      (CPUMHWVIRTDUMP_COMMON | CPUMHWVIRTDUMP_VMX | CPUMHWVIRTDUMP_SVM)
 
     PCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
@@ -2407 +2406 @@
     Assert(idxHwvirtState < RT_ELEMENTS(s_aHwvirtModes));
     const char *pcszHwvirtMode   = s_aHwvirtModes[idxHwvirtState];
-    uint32_t const fDumpState    = idxHwvirtState; /* | CPUMHWVIRTDUMP_ALL */
+    uint32_t fDumpState          = idxHwvirtState | CPUMHWVIRTDUMP_COMMON;
 
     /*
@@ -2415 +2414 @@
 
     if (fDumpState & CPUMHWVIRTDUMP_COMMON)
+    {
+        pHlp->pfnPrintf(pHlp, "fGif                           = %RTbool\n", pCtx->hwvirt.fGif);
         pHlp->pfnPrintf(pHlp, "fLocalForcedActions            = %#RX32\n",  pCtx->hwvirt.fLocalForcedActions);
-    pHlp->pfnPrintf(pHlp, "%s hwvirt state%s\n", pcszHwvirtMode, fDumpState ? ":" : "");
+    }
+    pHlp->pfnPrintf(pHlp, "%s hwvirt state%s\n", pcszHwvirtMode, (fDumpState & (CPUMHWVIRTDUMP_SVM | CPUMHWVIRTDUMP_VMX)) ?
+                                                                 ":" : "");
     if (fDumpState & CPUMHWVIRTDUMP_SVM)
     {
@@ -2453 +2456 @@
         pHlp->pfnPrintf(pHlp, "    idtr                       = %016RX64:%04x\n", pCtx->hwvirt.svm.HostState.idtr.pIdt,
                         pCtx->hwvirt.svm.HostState.idtr.cbIdt);
-        pHlp->pfnPrintf(pHlp, "  fGif                       = %u\n",        pCtx->hwvirt.fGif);
         pHlp->pfnPrintf(pHlp, "  cPauseFilter               = %RU16\n",     pCtx->hwvirt.svm.cPauseFilter);
         pHlp->pfnPrintf(pHlp, "  cPauseFilterThreshold      = %RU32\n",     pCtx->hwvirt.svm.cPauseFilterThreshold);