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

Timestamp:

May 20, 2020 3:35:33 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138079

Message:

Network/DevVirtioNet_1_0.cpp: Fixed bug where Network Settings on running VM led to assert in PDM infrastructure

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp (modified) (3 diffs)

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

@@ -945 +945 @@
             INSTANCE(pThis), &pThis->macConfigured, &macConfigured));
 #endif
+
 #if FEATURE_OFFERED(MQ)
         pHlp->pfnSSMGetU16( pSSM, &pThis->virtioNetConfig.uMaxVirtqPairs);
@@ -2528 +2529 @@
     bool fActiveLinkIsUp = (enmState == PDMNETWORKLINKSTATE_UP);
 
-    Log7Func(("%s enmState=%d\n", INSTANCE(pThis), enmState));
+    if (LogIs7Enabled())
+    {
+        LogFunc(("%s", INSTANCE(pThis)));
+        switch(enmState)
+        {
+        case PDMNETWORKLINKSTATE_UP:
+            Log(("UP\n"));
+            break;
+        case PDMNETWORKLINKSTATE_DOWN:
+            Log(("DOWN\n"));
+            break;
+        case PDMNETWORKLINKSTATE_DOWN_RESUME:
+            Log(("DOWN (RESUME)\n"));
+            break;
+        default:
+            Log(("UNKNOWN)\n"));
+        }
+    }
+
     if (enmState == PDMNETWORKLINKSTATE_DOWN_RESUME)
     {
@@ -2740 +2759 @@
     RT_NOREF(pThis);
 
-    int rc = PDMDevHlpDriverAttach(pDevIns, 0, &pDevIns->IBase, &pThisCC->pDrvBase, "Network Port");
+//    int rc = PDMDevHlpDriverAttach(pDevIns, 0, &pDevIns->IBase, &pThisCC->pDrvBase, "Network Port");
+    int rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThisCC->IBase, &pThisCC->pDrvBase, "Network Port");
     if (RT_SUCCESS(rc))
     {