Changeset 23933 in vbox

Timestamp:

Oct 21, 2009 1:21:10 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

53744

Message:

DevE1000,DevPCNet: Don't take the link temporarily down when teleporting. (Also, please don't create macros that sometimes expans to nothing, always use the do {} while (0) or (void)0 trick.)

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (3 diffs)
• DevPCNet.cpp (modified) (1 diff)

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

@@ -83 +83 @@
 #  define E1kLog2(a)              LogRel(a)
 #  define E1kLog3(a)              LogRel(a)
-//#  define E1kLog3(a)
+//#  define E1kLog3(a)              do {} while (0)
 # else
-#  define E1kLog(a)
-#  define E1kLog2(a)
-#  define E1kLog3(a)
+#  define E1kLog(a)               do {} while (0)
+#  define E1kLog2(a)              do {} while (0)
+#  define E1kLog3(a)              do {} while (0)
 # endif
 #else
@@ -93 +93 @@
 #  define E1kLog2(a)              Log2(a)
 #  define E1kLog3(a)              Log3(a)
-//#  define E1kLog(a)
-//#  define E1kLog2(a)
-//#  define E1kLog3(a)
+//#  define E1kLog(a)               do {} while (0)
+//#  define E1kLog2(a)              do {} while (0)
+//#  define E1kLog3(a)              do {} while (0)
 #endif
 
@@ -4575 +4575 @@
     /*
     * Force the link down here, since PDMNETWORKLINKSTATE_DOWN_RESUME is never
-    * passed to us. We go through all this stuff if the link was up only.
+    * passed to us. We go through all this stuff if the link was up and we
+    * wasn't teleported.
     */
-    if (STATUS & STATUS_LU)
-    {
-        E1kLog(("%s Link is down temporarely\n", INSTANCE(pState)));
+    if (    (STATUS & STATUS_LU)
+        && !PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns))
+    {
+        E1kLog(("%s Link is down temporarily\n", INSTANCE(pState)));
         STATUS &= ~STATUS_LU;
         Phy::setLinkStatus(&pState->phy, false);

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

@@ -4404 +4404 @@
     pcnetUpdateRingHandlers(pThis);
 #endif
-    /* Indicate link down to the guest OS that all network connections have been lost. */
-    pcnetTempLinkDown(pThis);
+    /* Indicate link down to the guest OS that all network connections have
+       been lost, unless we've been teleported here. */
+    if (!PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns))
+        pcnetTempLinkDown(pThis);
 
     return VINF_SUCCESS;