Changeset 24470 in vbox for trunk/src

Timestamp:

Nov 6, 2009 5:56:31 PM (15 years ago)

Author:

vboxsync

Message:

#3987: Virtio: Fixed the status reporting required by recent kernels (virtio drivers).

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet.cpp (modified) (9 diffs)

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

@@ -760 +760 @@
     rc = PDMDevHlpIOPortRegister(pPciDev->pDevIns, pState->addrIOPort, cb, 0,
                                  vpciIOPortOut, vpciIOPortIn, NULL, NULL, "VirtioNet");
-#if 0
+#ifdef VNET_GC_SUPPORT
     AssertRCReturn(rc, rc);
     rc = PDMDevHlpIOPortRegisterR0(pPciDev->pDevIns, pState->addrIOPort, cb, 0,
@@ -1372 +1372 @@
     vpciReset(&pState->VPCI);
     // TODO: Implement reset
+    if (pState->fCableConnected)
+        STATUS = VNET_S_LINK_UP;
+    else
+        STATUS = 0;
 }
 
@@ -1456 +1460 @@
 static int vnetCanReceive(VNETSTATE *pState)
 {
-    int rc = vpciCsEnter(&pState->VPCI, VERR_SEM_BUSY);
+    int rc = vnetCsEnter(pState, VERR_SEM_BUSY);
     LogFlow(("%s vnetCanReceive\n", INSTANCE(pState)));
     if (!(pState->VPCI.uStatus & VPCI_STATUS_DRV_OK))
@@ -1474 +1478 @@
 
     LogFlow(("%s vnetCanReceive -> %Vrc\n", INSTANCE(pState), rc));
-    vpciCsLeave(&pState->VPCI);
+    vnetCsLeave(pState);
     return rc;
 }
@@ -2135 +2139 @@
     AssertLogRelReturnVoid(iLUN == 0);
 
-    vpciCsEnter(&pState->VPCI, VERR_SEM_BUSY);
+    vnetCsEnter(pState, VERR_SEM_BUSY);
 
     /*
@@ -2143 +2147 @@
     pState->pDrv = NULL;
 
-    vpciCsLeave(&pState->VPCI);
+    vnetCsLeave(pState);
 }
 
@@ -2166 +2170 @@
     AssertLogRelReturn(iLUN == 0, VERR_PDM_NO_SUCH_LUN);
 
-    vpciCsEnter(&pState->VPCI, VERR_SEM_BUSY);
+    vnetCsEnter(pState, VERR_SEM_BUSY);
 
     /*
@@ -2203 +2207 @@
         vnetTempLinkDown(pState);
 
-    vpciCsLeave(&pState->VPCI);
+    vnetCsLeave(pState);
     return rc;
 
@@ -2239 +2243 @@
 
     /* Flags, combination of the PDM_DEVREG_FLAGS_* \#defines. */
-    PDM_DEVREG_FLAGS_DEFAULT_BITS, // | PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0,
+#ifdef VNET_GC_SUPPORT
+    PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0,
+#else
+    PDM_DEVREG_FLAGS_DEFAULT_BITS,
+#endif
     /* Device class(es), combination of the PDM_DEVREG_CLASS_* \#defines. */
     PDM_DEVREG_CLASS_NETWORK,