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

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/VMMDev

Files:

• VMMDev.cpp (modified) (5 diffs)
• VMMDevState.h (modified) (2 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -4279 +4279 @@
 
 
+#ifdef VBOX_WITH_RAW_MODE_KEEP
 /**
  * @interface_method_impl{PDMDEVREG,pfnRelocate}
@@ -4294 +4295 @@
     }
 }
+#endif
 
 
@@ -4358 +4360 @@
     pThis->pDevInsR3 = pDevIns;
     pThis->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
+#ifdef VBOX_WITH_RAW_MODE_KEEP
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
+#endif
 
     /* PCI vendor, just a free bogus value */
@@ -4593 +4597 @@
                                        N_("Failed to map first page of the VMMDev ram into kernel space: %Rrc"), rc);
 
-#ifdef VBOX_WITH_RAW_MODE
+#ifdef VBOX_WITH_RAW_MODE_KEEP
         rc = PDMDevHlpMMHyperMapMMIO2(pDevIns, &pThis->PciDev, 1 /*iRegion*/, 0 /*off*/, PAGE_SIZE, "VMMDev", &pThis->pVMMDevRAMRC);
         if (RT_FAILURE(rc))
@@ -4760 +4764 @@
     vmmdevDestruct,
     /* pfnRelocate */
+# ifdef VBOX_WITH_RAW_MODE_KEEP
     vmmdevRelocate,
+# else
+    NULL,
+# endif
     /* pfnMemSetup */
     NULL,

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -140 +140 @@
     uint32_t fHostCursorRequested;
 
-//#if HC_ARCH_BITS == 32
-//    /** Alignment padding. */
-//    uint32_t u32Alignment0;
-//#endif
-
+#ifdef VBOX_WITH_RAW_MODE_KEEP
     /** Pointer to device instance - RC pointer. */
     PPDMDEVINSRC pDevInsRC;
+#else
+    uint32_t u32Alignment0;
+#endif
     /** Pointer to device instance - R3 poitner. */
     PPDMDEVINSR3 pDevInsR3;
@@ -205 +204 @@
     /** R0 pointer to VMMDev RAM area - first page only, could be NULL! */
     R0PTRTYPE(VMMDevMemory *)   pVMMDevRAMR0;
+#ifdef VBOX_WITH_RAW_MODE_KEEP
     /** R0 pointer to VMMDev RAM area - first page only, could be NULL! */
     RCPTRTYPE(VMMDevMemory *)   pVMMDevRAMRC;
-#if HC_ARCH_BITS != 32
     RTRCPTR                     RCPtrAlignment3b;
 #endif