Changeset 82215 in vbox

Timestamp:

Nov 26, 2019 3:03:45 AM (5 years ago)

Author:

vboxsync

Message:

DevPCNet: Convered the temp MMIO2 region we create when loading old old saved states. bugref:9218

File:

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

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

@@ -397 +397 @@
     /** Emulated device type. */
     uint8_t                             uDevType;
-    /** Backwards compatible shared memory region during state loading. */
-    bool                                fSharedRegion;
-    bool                                afAlignment5[2];
+    bool                                afAlignment5[3];
     /** Link speed to be reported through CSR68. */
     uint32_t                            u32LinkSpeed;
@@ -418 +416 @@
     /** ISA I/O ports offset 0x00-0x0f. */
     IOMIOPORTHANDLE                     hIoPortsIsaAProm;
+
+    /** Backwards compatible shared memory region during state loading (before 4.3.6). */
+    PGMMMIO2HANDLE                      hMmio2Shared;
 
     /** The loopback transmit buffer (avoid stack allocations). */
@@ -4485 +4486 @@
         /* older saved states contain the shared memory region which was never used for ages. */
         void *pvSharedMMIOR3;
-        rc = PDMDevHlpMMIO2Register(pDevIns, pDevIns->apPciDevs[0], 2, _512K, 0, (void **)&pvSharedMMIOR3, "PCnetSh");
+        rc = PDMDevHlpMmio2Create(pDevIns, pDevIns->apPciDevs[0], 2, _512K, 0, "PCnetSh", &pvSharedMMIOR3, &pThis->hMmio2Shared);
         if (RT_FAILURE(rc))
             rc = PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
                                      N_("Failed to allocate the dummy shmem region for the PCnet device"));
-        pThis->fSharedRegion = true;
-    }
+    }
+
     PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
-
     return rc;
 }
@@ -4610 +4610 @@
     PPCNETSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PPCNETSTATE);
     int rc = VINF_SUCCESS;
-    if (pThis->fSharedRegion)
+    if (pThis->hMmio2Shared != NIL_PGMMMIO2HANDLE)
     {
         /* drop this dummy region */
-        rc = PDMDevHlpMMIOExDeregister(pDevIns, NULL, 2);
-        pThis->fSharedRegion = false;
+        rc = pDevIns->pHlpR3->pfnMmio2Destroy(pDevIns, pThis->hMmio2Shared);
+        AssertLogRelRC(rc);
+        pThis->hMmio2Shared = NIL_PGMMMIO2HANDLE;
     }
     return rc;
@@ -5079 +5080 @@
     pThis->hIoPortsIsa          = NIL_IOMIOPORTHANDLE;
     pThis->hIoPortsIsaAProm     = NIL_IOMIOPORTHANDLE;
+    pThis->hMmio2Shared         = NIL_PGMMMIO2HANDLE;
     pThisCC->pDevIns            = pDevIns;