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

Timestamp:

Feb 16, 2021 5:44:39 PM (4 years ago)

Author:

vboxsync

Message:

DevE1000: Fixed four e1kRaiseInterrupt calls broken by r29792 when adding the rcBusy parameter.

File:

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

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

@@ -2171 +2171 @@
  * @param   pThis       The device state structure.
  */
-static int e1kRaiseInterrupt(PPDMDEVINS pDevIns, PE1KSTATE pThis, int rcBusy, uint32_t u32IntCause = 0)
+static int e1kRaiseInterrupt(PPDMDEVINS pDevIns, PE1KSTATE pThis, int rcBusy, uint32_t u32IntCause)
 {
     int rc = e1kCsEnter(pThis, rcBusy);
@@ -3543 +3543 @@
     e1kCancelTimer(pDevIns, pThis, pThis->hTADTimer);
 #  endif
-    e1kRaiseInterrupt(pDevIns, pThis, ICR_TXDW);
+    e1kRaiseInterrupt(pDevIns, pThis, VERR_IGNORED, ICR_TXDW);
 }
 
@@ -3557 +3557 @@
     /* Cancel interrupt delay timer as we have already got attention */
     e1kCancelTimer(pDevIns, pThis, pThis->hTIDTimer);
-    e1kRaiseInterrupt(pDevIns, pThis, ICR_TXDW);
+    e1kRaiseInterrupt(pDevIns, pThis, VERR_IGNORED, ICR_TXDW);
 }
 
@@ -3574 +3574 @@
     /* Cancel absolute delay timer as we have already got attention */
     e1kCancelTimer(pDevIns, pThis, pThis->hRADTimer);
-    e1kRaiseInterrupt(pDevIns, pThis, ICR_RXT0);
+    e1kRaiseInterrupt(pDevIns, pThis, VERR_IGNORED, ICR_RXT0);
 }
 
@@ -3588 +3588 @@
     /* Cancel interrupt delay timer as we have already got attention */
     e1kCancelTimer(pDevIns, pThis, pThis->hRIDTimer);
-    e1kRaiseInterrupt(pDevIns, pThis, ICR_RXT0);
+    e1kRaiseInterrupt(pDevIns, pThis, VERR_IGNORED, ICR_RXT0);
 }