Changeset 72268 in vbox

Timestamp:

May 20, 2018 11:29:26 PM (7 years ago)

Author:

vboxsync

Message:

DBGC: Only use DBGF_AS_RC_AND_GC_GLOBAL for !HM and !NEM.

Location:

trunk/src/VBox/Debugger

Files:

• DBGConsole.cpp (modified) (2 diffs)
• testcase/tstDBGCStubs.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -165 +165 @@
 #include <VBox/vmm/vmapi.h> /* VMR3GetVM() */
 #include <VBox/vmm/hm.h>    /* HMR3IsEnabled */
+#include <VBox/vmm/nem.h>   /* NEMR3IsEnabled */
 #include <VBox/err.h>
 #include <VBox/log.h>
@@ -1210 +1211 @@
     if (RT_FAILURE(rc))
         return rc;
-    if (!HMR3IsEnabled(pUVM))
+    if (!HMR3IsEnabled(pUVM) && !NEMR3IsEnabled(pUVM))
         pDbgc->hDbgAs = DBGF_AS_RC_AND_GC_GLOBAL;
 

trunk/src/VBox/Debugger/testcase/tstDBGCStubs.cpp

@@ -647 +647 @@
 
 
+#include <VBox/vmm/nem.h>
+VMMR3DECL(bool) NEMR3IsEnabled(PUVM pUVM)
+{
+    return true;
+}
+
+
 #include <VBox/vmm/pgm.h>