Changeset 80295 in vbox for trunk/src/VBox/Devices/Graphics/HGSMI

Timestamp:

Aug 15, 2019 3:46:09 PM (6 years ago)

Author:

vboxsync

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

132753

Message:

Graphics/HGSMIHost.h: Avoid including vm.h just for three cases of VM_ASSERT_EMT. bugref:9217

Location:

trunk/src/VBox/Devices/Graphics/HGSMI

Files:

• HGSMIHost.cpp (modified) (5 diffs)
• HGSMIHost.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -59 +59 @@
  */
 
+#define LOG_GROUP LOG_GROUP_HGSMI
 #include <iprt/alloc.h>
 #include <iprt/critsect.h>
@@ -68 +69 @@
 #include <VBox/AssertGuest.h>
 #include <iprt/errcore.h>
-#define LOG_GROUP LOG_GROUP_HGSMI
 #include <VBox/log.h>
 #include <VBox/vmm/ssm.h>
+#include <VBox/vmm/vmm.h>
 
 #include "HGSMIHost.h"
@@ -326 +327 @@
     AssertPtr(pIns);
 
-    VM_ASSERT_EMT(pIns->pVM);
+    Assert(VMMGetCpu(pIns->pVM) != NULL);
 
 #ifndef VBOX_WITH_WDDM
@@ -343 +344 @@
 static bool hgsmiProcessHostCmdCompletion(HGSMIINSTANCE *pIns, HGSMIOFFSET offBuffer, bool fCompleteFirst)
 {
-    VM_ASSERT_EMT(pIns->pVM);
+    Assert(VMMGetCpu(pIns->pVM) != NULL);
 
     int rc = hgsmiFIFOLock(pIns);
@@ -413 +414 @@
     LogFlowFunc(("pIns %p\n", pIns));
 
-    VM_ASSERT_EMT(pIns->pVM);
+    Assert(VMMGetCpu(pIns->pVM) != NULL);
 
     AssertPtrReturn(pIns->pHGFlags, HGSMIOFFSET_VOID);

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h

@@ -22 +22 @@
 #endif
 
-#include <VBox/vmm/vm.h>
-
+#include <VBox/types.h>
 #include <HGSMI.h>
 #include <HGSMIChSetup.h>