Changeset 9212 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

May 29, 2008 9:38:38 AM (17 years ago)

Author:

vboxsync

Message:

Major changes for sizeof(RTGCPTR) == uint64_t.
Introduced RCPTRTYPE for pointers valid in raw mode only (RTGCPTR32).

Disabled by default. Enable by adding VBOX_WITH_64_BITS_GUESTS to your LocalConfig.kmk.

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -114 +114 @@
     R3R0PTRTYPE(PTMTIMER)               pTimerPollHC;
     /** Poll timer (address for guest context) */
-    GCPTRTYPE(PTMTIMER)                 pTimerPollGC;
+    RCPTRTYPE(PTMTIMER)                 pTimerPollGC;
 #endif
 
@@ -124 +124 @@
     R3R0PTRTYPE(PTMTIMER)               pTimerSoftIntHC;
     /** Software Interrupt timer (address for guest context) */
-    GCPTRTYPE(PTMTIMER)                 pTimerSoftIntGC;
+    RCPTRTYPE(PTMTIMER)                 pTimerSoftIntGC;
 
     /** Register Address Pointer */
@@ -166 +166 @@
 
     /** Transmit signaller */
-    GCPTRTYPE(PPDMQUEUE)                pXmitQueueGC;
+    RCPTRTYPE(PPDMQUEUE)                pXmitQueueGC;
     R3R0PTRTYPE(PPDMQUEUE)              pXmitQueueHC;
 
     /** Receive signaller */
     R3R0PTRTYPE(PPDMQUEUE)              pCanRxQueueHC;
-    GCPTRTYPE(PPDMQUEUE)                pCanRxQueueGC;
+    RCPTRTYPE(PPDMQUEUE)                pCanRxQueueGC;
     /** Pointer to the device instance. */
-    GCPTRTYPE(PPDMDEVINS)               pDevInsGC;
+    RCPTRTYPE(PPDMDEVINS)               pDevInsGC;
     /** Pointer to the device instance. */
     R3R0PTRTYPE(PPDMDEVINS)             pDevInsHC;
@@ -241 +241 @@
     R3R0PTRTYPE(PPCNETGUESTSHAREDMEMORY) pSharedMMIOHC;
     /** The hypervisor/guest context of the shared memory used for the private interface. */
-    GCPTRTYPE(PPCNETGUESTSHAREDMEMORY)  pSharedMMIOGC;
+    RCPTRTYPE(PPCNETGUESTSHAREDMEMORY)  pSharedMMIOGC;
 
 #if HC_ARCH_BITS == 64
@@ -4745 +4745 @@
     if (fPrivIfEnabled)
     {
+        RTGCPTR pGCMapping;
+
         /*
          * Initialize shared memory between host and guest for descriptors and RX buffers. Most guests
@@ -4753 +4755 @@
             return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
                                        N_("Failed to allocate %u bytes of memory for the PCNet device"), PCNET_GUEST_SHARED_MEMORY_SIZE);
-        rc = PDMDevHlpMMHyperMapMMIO2(pDevIns, 2, 0, 8192, "PCNetShMem", &pData->pSharedMMIOGC);
+        rc = PDMDevHlpMMHyperMapMMIO2(pDevIns, 2, 0, 8192, "PCNetShMem", &pGCMapping);
         if (VBOX_FAILURE(rc))
             return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
                                        N_("Failed to map 8192 bytes of memory for the PCNet device into the hyper memory"));
+        pData->pSharedMMIOGC = pGCMapping;
         pcnetInitSharedMemory(pData);
         rc = PDMDevHlpPCIIORegionRegister(pDevIns, 2, PCNET_GUEST_SHARED_MEMORY_SIZE,