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

Timestamp:

Apr 7, 2008 2:05:20 PM (17 years ago)

Author:

vboxsync

Message:

Use the new PDMDevHlpVMState, drop the fSaving flag.

File:

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

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

@@ -193 +193 @@
     /** If set the link is temporarily down because of a saved state load. */
     bool                                fLinkTempDown;
-    /** This flag is set on SavePrep to prevent altering of memory after pgmR3Save() was called
-     * @todo r=bird: This is inadequate, we are not supposed to do anything at all while the VM
-     *               isn't running. Naturally, the problem really lies with the driver and not
-     *               the pcnet code. We will have to address this properly at some time. */
-    bool                                fSaving;
 
     /** Number of times we've reported the link down. */
@@ -203 +198 @@
     /** The configured MAC address. */
     PDMMAC                              MacConfigured;
+    /** Alignment padding. */
+    uint8_t                             Alignment4[HC_ARCH_BITS == 64 ? 6 : 2];
 
     /** The LED. */
@@ -4023 +4020 @@
 
 /**
- * Prepares for state saving.
- * We must stop the RX process to prevent altering of the main memory after saving.
+ * Serializes the receive thread, it may be working inside the critsect.
  *
  * @returns VBox status code.
@@ -4036 +4032 @@
     int rc = PDMCritSectEnter(&pData->CritSect, VERR_SEM_BUSY);
     AssertRC(rc);
-
-    pData->fSaving = true;
-    /* From now on drop all received packets to prevent altering of main memory after
-     * pgmR3Save() was called but before the RX thread is terminated */
-
     PDMCritSectLeave(&pData->CritSect);
+
     return VINF_SUCCESS;
 }
@@ -4088 +4080 @@
 
 /**
- * Cleanup after saving.
+ * Serializes the receive thread, it may be working inside the critsect.
  *
  * @returns VBox status code.
@@ -4094 +4086 @@
  * @param   pSSMHandle  The handle to save the state to.
  */
-static DECLCALLBACK(int) pcnetSaveDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
+static DECLCALLBACK(int) pcnetLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
 {
     PCNetState *pData = PDMINS2DATA(pDevIns, PCNetState *);
@@ -4100 +4092 @@
     int rc = PDMCritSectEnter(&pData->CritSect, VERR_SEM_BUSY);
     AssertRC(rc);
-    pData->fSaving = false;
     PDMCritSectLeave(&pData->CritSect);
+
     return VINF_SUCCESS;
 }
@@ -4274 +4266 @@
     AssertReleaseRC(rc);
 
-    if (!pData->fSaving)
-    {
-        if (cb > 70) /* unqualified guess */
-            pData->Led.Asserted.s.fReading = pData->Led.Actual.s.fReading = 1;
-        pcnetReceiveNoSync(pData, (const uint8_t *)pvBuf, cb);
-        pData->Led.Actual.s.fReading = 0;
-    }
-    /* otherwise junk the data to Nirwana. */
+    if (cb > 70) /* unqualified guess */
+        pData->Led.Asserted.s.fReading = pData->Led.Actual.s.fReading = 1;
+    pcnetReceiveNoSync(pData, (const uint8_t *)pvBuf, cb);
+    pData->Led.Actual.s.fReading = 0;
 
     PDMCritSectLeave(&pData->CritSect);
@@ -4684 +4672 @@
         return rc;
     }
-/** @todo r=bird: we're not locking down pcnet properly during saving and loading! */
     rc = PDMDevHlpSSMRegister(pDevIns, pDevIns->pDevReg->szDeviceName, iInstance,
                               PCNET_SAVEDSTATE_VERSION, sizeof(*pData),
-                              pcnetSavePrep, pcnetSaveExec, pcnetSaveDone,
-                              NULL, pcnetLoadExec, NULL);
+                              pcnetSavePrep, pcnetSaveExec, NULL,
+                              pcnetLoadPrep, pcnetLoadExec, NULL);
     if (VBOX_FAILURE(rc))
         return rc;