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

Timestamp:

Dec 10, 2021 2:27:11 PM (3 years ago)

Author:

vboxsync

Message:

Dev/E1000: bugref:10114 Introduces device attachment flag to resolve link status issue with Oracle Linux guests.

File:

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

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

@@ -1068 +1068 @@
     /** EMT: false if the cable is disconnected by the GUI. */
     bool        fCableConnected;
+    /** true if the device is attached to a driver. */
+    bool        fIsAttached;
     /** EMT: Compute Ethernet CRC for RX packets. */
     bool        fEthernetCRC;
@@ -2930 +2932 @@
 {
     PE1KSTATE     pThis   = PDMDEVINS_2_DATA(pDevIns, PE1KSTATE);
-    PE1KSTATECC   pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PE1KSTATECC);
-    return pThis->fCableConnected && pThisCC->CTX_SUFF(pDrv);
+    return pThis->fCableConnected && pThis->fIsAttached;
 }
 
@@ -2948 +2949 @@
     if (e1kIsConnected(pDevIns) && (CTRL & CTRL_SLU))
         e1kArmTimer(pDevIns, pThis, pThis->hLUTimer, E1K_INIT_LINKUP_DELAY_US);
+    else
+        Log(("%s PHY link reset callback ignored (cable %sconnected, driver %stached, CTRL_SLU=%u)\n", pThis->szPrf,
+             pThis->fCableConnected ? "" : "dis", pThis->fIsAttached ? "at" : "de", CTRL & CTRL_SLU ? 1 : 0));
 }
 
@@ -7620 +7624 @@
     e1kR3CsEnterAsserted(pThis);
 
+    /* Mark device as detached. */
+    pThis->fIsAttached = false;
     /*
      * Zero some important members.
@@ -7671 +7677 @@
             pThisRC->pDrvRC = PDMIBASERC_QUERY_INTERFACE(PDMIBASE_QUERY_INTERFACE(pThisCC->pDrvBase, PDMIBASERC), PDMINETWORKUP);
 #endif
+            /* Mark device as attached. */
+            pThis->fIsAttached = true;
         }
     }
@@ -7891 +7899 @@
     pThis->led.u32Magic = PDMLED_MAGIC;
     pThis->u32PktNo     = 1;
+    pThis->fIsAttached  = false;
 
     pThisCC->pDevInsR3  = pDevIns;
@@ -8160 +8169 @@
         pThisRC->pDrvRC = PDMIBASERC_QUERY_INTERFACE(PDMIBASE_QUERY_INTERFACE(pThisCC->pDrvBase, PDMIBASERC), PDMINETWORKUP);
 #endif
+        /* Mark device as attached. */
+        pThis->fIsAttached = true;
     }
     else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER