Changeset 83282 in vbox for trunk/src

Timestamp:

Mar 13, 2020 1:03:21 PM (5 years ago)

Author:

vboxsync

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

136438

Message:

Devices/DevVGA: Make use of the new PDM device helpers instead of calling exported VMM functions directly

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (3 diffs)

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

@@ -73 +73 @@
 #include <VBox/AssertGuest.h>
 #ifdef IN_RING3
-# include <VBox/vmm/cpum.h>
 # include <iprt/mem.h>
 # include <iprt/ctype.h>
@@ -6676 +6675 @@
      * Register access handler types for tracking dirty VRAM pages.
      */
-    rc = PGMR3HandlerPhysicalTypeRegister(pVM, PGMPHYSHANDLERKIND_WRITE,
-                                          vgaLFBAccessHandler,
-                                          g_DeviceVga.pszR0Mod, "vgaLFBAccessHandler", "vgaLbfAccessPfHandler",
-                                          g_DeviceVga.pszRCMod, "vgaLFBAccessHandler", "vgaLbfAccessPfHandler",
-                                          "VGA LFB", &pThis->hLfbAccessHandlerType);
+    rc = PDMDevHlpPGMHandlerPhysicalTypeRegister(pDevIns, PGMPHYSHANDLERKIND_WRITE,
+                                                 vgaLFBAccessHandler,
+                                                 "vgaLFBAccessHandler", "vgaLbfAccessPfHandler",
+                                                 "vgaLFBAccessHandler", "vgaLbfAccessPfHandler",
+                                                 "VGA LFB", &pThis->hLfbAccessHandlerType);
     AssertRCReturn(rc, rc);
 
@@ -6818 +6817 @@
     if (pThisCC->pbVgaBios == NULL)
     {
-        CPUMMICROARCH enmMicroarch = pVM ? CPUMGetGuestMicroarch(pVM) : kCpumMicroarch_Intel_P6;
+        CPUMMICROARCH enmMicroarch = PDMDevHlpCpuGetGuestMicroarch(pDevIns);
         if (   enmMicroarch == kCpumMicroarch_Intel_8086
             || enmMicroarch == kCpumMicroarch_Intel_80186