Changeset 49813 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 6, 2013 1:41:50 PM (11 years ago)

Author:

vboxsync

Message:

DevPCNet: register a dummy MMIO2 region to be compatible to old saved states but drop it later

File:

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

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

@@ -55 +55 @@
 #include <VBox/vmm/pdmnetifs.h>
 #include <VBox/vmm/pgm.h>
+#include <VBox/version.h>
 #include <iprt/asm.h>
 #include <iprt/assert.h>
@@ -403 +404 @@
     bool                                fAm79C973;
     /* Link speed to be reported through CSR68. */
-    bool                                Alignment5;
+    bool                                fSharedRegion;
     /* Alignment padding. */
     uint32_t                            u32LinkSpeed;
@@ -3914 +3915 @@
 
 
-/**
- * @callback_method_impl{FNPCIIOREGIONMAP, VBox specific MMIO2 interface.}
- */
-static DECLCALLBACK(int) pcnetMMIOSharedMap(PPCIDEVICE pPciDev, /*unsigned*/ int iRegion,
-                                            RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType)
-{
-    if (GCPhysAddress != NIL_RTGCPHYS)
-        return PDMDevHlpMMIO2Map(pPciDev->pDevIns, iRegion, GCPhysAddress);
-
-    /* nothing to clean up */
-    return VINF_SUCCESS;
-}
-
-
 /* -=-=-=-=-=- Debug Info Handler -=-=-=-=-=- */
 
@@ -4259 +4246 @@
 
 /**
- * @callback_method_impl{FNSSMDEVLOADPREP,
+ * @callback_method_impl{FNSSMDEVLOADPREP},
  *      Serializes the receive thread, it may be working inside the critsect.}
  */
@@ -4268 +4255 @@
     int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
     AssertRC(rc);
+
+    uint32_t uVer = SSMR3HandleVersion(pSSM);
+    if (    uVer  < VBOX_FULL_VERSION_MAKE(4, 3,  6)
+        || (   uVer >= VBOX_FULL_VERSION_MAKE(4, 3, 51)
+            && uVer <  VBOX_FULL_VERSION_MAKE(4, 3, 53)))
+    {
+        /* older saved states contain the shared memory region which was never used for ages. */
+        void *pvSharedMMIOR3;
+        rc = PDMDevHlpMMIO2Register(pDevIns, 2, _512K, 0, (void **)&pvSharedMMIOR3, "PCNetSh");
+        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;
+    }
     PDMCritSectLeave(&pThis->CritSect);
 
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -4377 +4378 @@
 }
 
+/**
+ * @callback_method_impl{FNSSMDEVLOADDONE}
+ */
+static DECLCALLBACK(int) pcnetLoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+{
+    PPCNETSTATE pThis = PDMINS_2_DATA(pDevIns, PPCNETSTATE);
+    int rc = VINF_SUCCESS;
+    if (pThis->fSharedRegion)
+    {
+        /* drop this dummy region */
+        rc = PDMDevHlpMMIO2Deregister(pDevIns, 2);
+        pThis->fSharedRegion = false;
+    }
+    return rc;
+}
 
 /* -=-=-=-=-=- PCNETSTATE::INetworkDown -=-=-=-=-=- */
@@ -4956 +4972 @@
         return rc;
 
-    /** XXX remove! */
-#define PCNET_GUEST_SHARED_MEMORY_SIZE _512K
-    void *pvSharedMMIOR3;
-    rc = PDMDevHlpMMIO2Register(pDevIns, 2, PCNET_GUEST_SHARED_MEMORY_SIZE, 0, (void **)&pvSharedMMIOR3, "PCNetSh");
-    if (RT_FAILURE(rc))
-        return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
-                                   N_("Failed to allocate %u bytes of memory for the PCNet device"),
-                                   PCNET_GUEST_SHARED_MEMORY_SIZE);
-
 #ifdef PCNET_NO_POLLING
     /*
@@ -5001 +5008 @@
                                 NULL,          pcnetLiveExec, NULL,
                                 pcnetSavePrep, pcnetSaveExec, NULL,
-                                pcnetLoadPrep, pcnetLoadExec, NULL);
+                                pcnetLoadPrep, pcnetLoadExec, pcnetLoadDone);
     if (RT_FAILURE(rc))
         return rc;