Changeset 18418 in vbox for trunk/src

Timestamp:

Mar 27, 2009 5:38:06 PM (16 years ago)

Author:

vboxsync

Message:

quick fix for #3775

File:

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

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

@@ -804 +804 @@
 }
 
+#ifdef IN_RING3
+
 /**
  * Store receive message descriptor and hand it over to the host (the VM guest).
@@ -852 +854 @@
     }
 }
+
+#endif /* IN_RING3 */
 
 /** Checks if it's a bad (as in invalid) RMD.*/
@@ -1549 +1553 @@
         if (pcnetRmdLoad(pThis, &rmd, PHYSADDR(pThis, addr), false))
             cbRxBuffers += 4096-rmd.rmd1.bcnt;
+        /* Hack: Make sure that all receive buffers are touched when the
+         * device is initialized. */
+        static char aBuf[4096];
+        RTGCPHYS32 rbadr = PHYSADDR(pThis, rmd.rmd0.rbadr);
+        /* don't change the content */
+        PDMDevHlpPhysRead(pDevIns, rbadr, aBuf, RT_MIN(sizeof(aBuf), 4096U-rmd.rmd1.bcnt));
+        PDMDevHlpPhysWrite(pDevIns, rbadr, aBuf, RT_MIN(sizeof(aBuf), 4096U-rmd.rmd1.bcnt));
     }
 
@@ -3747 +3758 @@
     int         rc;
 
-    /*
-     * Don't block if we cannot enter here.
-     */
-    rc = PDMR3CritSectTryEnter(&pThis->CritSect);
-    if (RT_SUCCESS(rc))
-    {
-        STAM_PROFILE_ADV_START(&pThis->StatTimer, a);
-        pcnetPollTimer(pThis);
-        PDMCritSectLeave(&pThis->CritSect);
-        STAM_PROFILE_ADV_STOP(&pThis->StatTimer, a);
-    }
-    else
-        pcnetPollTimerStart(pThis);
+    STAM_PROFILE_ADV_START(&pThis->StatTimer, a);
+    rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    AssertReleaseRC(rc);
+
+    pcnetPollTimer(pThis);
+
+    PDMCritSectLeave(&pThis->CritSect);
+    STAM_PROFILE_ADV_STOP(&pThis->StatTimer, a);
 }