Changeset 80118 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Aug 4, 2019 2:39:54 AM (6 years ago)

Author:

vboxsync

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

132559

Message:

VMM: Kicking out raw-mode and 32-bit hosts - MM, PGM, ++. bugref:9517 bugref:9511

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (5 diffs)
• DevVGA.h (modified) (2 diffs)

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

@@ -5986 +5986 @@
 static DECLCALLBACK(void) vgaR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
+# ifdef VBOX_WITH_RAW_MODE_KEEP
     if (offDelta)
     {
@@ -5994 +5995 @@
         pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
     }
+# else
+    RT_NOREF(pDevIns, offDelta);
+# endif
 }
 
@@ -6340 +6344 @@
     pThis->pDevInsR3 = pDevIns;
     pThis->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
+#ifdef VBOX_WITH_RAW_MODE_KEEP
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
+#endif
 
     vgaR3Reset(pDevIns);
@@ -6489 +6495 @@
     pThis->vram_ptrR0 = (RTR0PTR)pThis->vram_ptrR3; /** @todo @bugref{1865} Map parts into R0 or just use PGM access (Mac only). */
 
+#ifdef VBOX_WITH_RAW_MODE_KEEP
     if (pThis->fGCEnabled)
     {
@@ -6496 +6503 @@
         AssertLogRelMsgRCReturn(rc, ("PDMDevHlpMMHyperMapMMIO2(%#x,) -> %Rrc\n", VGA_MAPPING_SIZE, rc), rc);
         pThis->vram_ptrRC = pRCMapping;
-#ifdef VBOX_WITH_VMSVGA
+# ifdef VBOX_WITH_VMSVGA
         /* Don't need a mapping in RC */
-#endif
-    }
+# endif
+    }
+#endif
 
 #if defined(VBOX_WITH_2X_4GB_ADDR_SPACE)

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

@@ -278 +278 @@
     uint32_t                    u32Marker;
 
+# ifdef VBOX_WITH_RAW_MODE_KEEP
     /** Pointer to the device instance - RC Ptr. */
     PPDMDEVINSRC                pDevInsRC;
@@ -283 +284 @@
     RCPTRTYPE(uint8_t *)        vram_ptrRC;
     uint32_t                    Padding1;
+# endif
 
     /** Pointer to the device instance - R3 Ptr. */