Changeset 86266 in vbox

Timestamp:

Sep 24, 2020 2:35:34 PM (4 years ago)

Author:

vboxsync

Message:

Devices/Graphics: Split DevVGA-SVGA.cpp to two source files (device and command implementation) and an internal header file (missed a define). bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA-cmd.cpp (modified) (1 diff)
• DevVGA-SVGA.cpp (modified) (3 diffs)
• DevVGA-SVGA.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA-cmd.cpp

@@ -31 +31 @@
 #include "DevVGA.h"
 
+/* Should be included after DevVGA.h/DevVGA-SVGA.h to pick all defines. */
 #include "DevVGA-SVGA-internal.h"
 #ifdef VBOX_WITH_VMSVGA3D

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -130 +130 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_DEV_VMSVGA
-#define VMSVGA_USE_EMT_HALT_CODE
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/version.h>
@@ -136 +135 @@
 #include <VBox/log.h>
 #include <VBox/vmm/pgm.h>
-#ifdef VMSVGA_USE_EMT_HALT_CODE
-# include <VBox/vmm/vmapi.h>
-# include <VBox/vmm/vmcpuset.h>
-#endif
 #include <VBox/sup.h>
 
@@ -161 +156 @@
 #include "DevVGA.h"
 
-#include "DevVGA-SVGA.h"
 #ifdef IN_RING3
+/* Should be included after DevVGA.h/DevVGA-SVGA.h to pick all defines. */
 #include "DevVGA-SVGA-internal.h"
 #endif

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.h

@@ -25 +25 @@
 #endif
 
+#define VMSVGA_USE_EMT_HALT_CODE
+
 #include <VBox/pci.h>
 #include <VBox/vmm/pdmifs.h>
 #include <VBox/vmm/pdmthread.h>
 #include <VBox/vmm/stam.h>
+#ifdef VMSVGA_USE_EMT_HALT_CODE
+# include <VBox/vmm/vmapi.h>
+# include <VBox/vmm/vmcpuset.h>
+#endif
 
 /*