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

Timestamp:

May 2, 2012 5:05:45 PM (13 years ago)

Author:

vboxsync

Message:

e1000: bumped SSM version for changes made in r77543

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (3 diffs)

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

@@ -943 +943 @@
 
 
+#ifdef E1K_WITH_TXD_CACHE
+/** The current Saved state version. */
+#define E1K_SAVEDSTATE_VERSION          4
+/** Saved state version for VirtualBox 4.2 with VLAN tag fields.  */
+#define E1K_SAVEDSTATE_VERSION_VBOX_42_VTAG  3
+#else /* !E1K_WITH_TXD_CACHE */
 /** The current Saved state version. */
 #define E1K_SAVEDSTATE_VERSION          3
+#endif /* !E1K_WITH_TXD_CACHE */
 /** Saved state version for VirtualBox 4.1 and earlier.
  * These did not include VLAN tag fields.  */
@@ -6092 +6099 @@
 
     if (    uVersion != E1K_SAVEDSTATE_VERSION
+#ifdef E1K_WITH_TXD_CACHE
+        &&  uVersion != E1K_SAVEDSTATE_VERSION_VBOX_42_VTAG
+#endif /* E1K_WITH_TXD_CACHE */
         &&  uVersion != E1K_SAVEDSTATE_VERSION_VBOX_41
         &&  uVersion != E1K_SAVEDSTATE_VERSION_VBOX_30)
@@ -6146 +6156 @@
             rc = SSMR3GetU16(pSSM, &pState->u16VTagTCI);
             AssertRCReturn(rc, rc);
+        }
+        else
+        {
+            pState->fVTag      = false;
+            pState->u16VTagTCI = 0;
+        }
 #ifdef E1K_WITH_TXD_CACHE
+        if (uVersion > E1K_SAVEDSTATE_VERSION_VBOX_42_VTAG)
+        {
             rc = SSMR3GetU8(pSSM, &pState->nTxDFetched);
             AssertRCReturn(rc, rc);
             SSMR3GetMem(pSSM, pState->aTxDescriptors,
                         pState->nTxDFetched * sizeof(pState->aTxDescriptors[0]));
-#endif /* E1K_WITH_TXD_CACHE */
         }
         else
-        {
-            pState->fVTag      = false;
-            pState->u16VTagTCI = 0;
-#ifdef E1K_WITH_TXD_CACHE
             pState->nTxDFetched = 0;
 #endif /* E1K_WITH_TXD_CACHE */
-        }
         /* derived state  */
         e1kSetupGsoCtx(&pState->GsoCtx, &pState->contextTSE);