Changeset 7795 in vbox for trunk/src/VBox

Timestamp:

Apr 8, 2008 12:02:15 PM (17 years ago)

Author:

vboxsync

Message:

PCNet: allow the guest to disable/enable the private interface

File:

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

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

@@ -1361 +1361 @@
 }
 
+/**
+ * Enable/disable the private guest interface.
+ */
+static void pcnetEnablePrivateIf(PCNetState *pData)
+{
+    bool fPrivIfEnabled =       pData->pSharedMMIOHC
+                          && !!(pData->CTXSUFF(pSharedMMIO)->fFlags & PCNET_GUEST_FLAGS_ADMIT_GUEST);
+    if (fPrivIfEnabled != pData->fPrivIfEnabled)
+    {
+        pData->fPrivIfEnabled = fPrivIfEnabled;
+        LogRel(("PCNet#%d: %s private interface\n", PCNET_INST_NR, fPrivIfEnabled ? "Enabling" : "Disabling"));
+    }
+}
+
 #ifdef IN_RING3
 #ifdef PCNET_NO_POLLING
@@ -1476 +1490 @@
 } while (0)
 
-    bool fPrivIfEnabled =       pData->pSharedMMIOHC
-                          && !!(pData->pSharedMMIOHC->fFlags & PCNET_GUEST_FLAGS_ADMIT_GUEST);
-    if (fPrivIfEnabled != pData->fPrivIfEnabled)
-    {
-        pData->fPrivIfEnabled = fPrivIfEnabled;
-        LogRel(("PCNet#%d: %s private interface\n", PCNET_INST_NR, fPrivIfEnabled ? "Enabling" : "Disabling"));
-    }
+    pcnetEnablePrivateIf(pData);
+
     if (BCR_SSIZE32(pData))
     {
@@ -1535 +1544 @@
     if (!CSR_DRX(pData))
         pData->aCSR[0] |= 0x0020;    /* set RXON */
+    pcnetEnablePrivateIf(pData);
     pData->aCSR[0] &= ~0x0004;       /* clear STOP bit */
     pData->aCSR[0] |=  0x0002;       /* STRT */
@@ -1549 +1559 @@
     pData->aCSR[4] &= ~0x02c2;
     pData->aCSR[5] &= ~0x0011;
+    pcnetEnablePrivateIf(pData);
     pcnetPollTimer(pData);
 }
@@ -1561 +1572 @@
 }
 #endif
+
 
 /**
@@ -4411 +4423 @@
     pData->pXmitQueueGC  = PDMQueueGCPtr(pData->pXmitQueueHC);
     pData->pCanRxQueueGC = PDMQueueGCPtr(pData->pCanRxQueueHC);
-    pData->pSharedMMIOGC += offDelta;
+    if (pData->pSharedMMIOHC)
+        pData->pSharedMMIOGC += offDelta;
 #ifdef PCNET_NO_POLLING
     *(RTHCUINTPTR *)&pData->pfnEMInterpretInstructionGC += offDelta;