Changeset 92996 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 17, 2021 8:18:43 AM (3 years ago)

Author:

vboxsync

Message:

virtio-net works on linux in local testing, and virtio-scsi works on windows. Integrating the switchover to make DevVirtioNet_1_0.cpp the 'virtio-net' option in the Virtual Network Controller list.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• ConsoleImpl2.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -1558 +1558 @@
             return "virtio-net";
 #endif
-#ifdef VBOX_WITH_VIRTIO_NET_1_0
-        case NetworkAdapterType_Virtio_1_0:
-            return "virtio-net-1-dot-0";
-#endif
         default:
             AssertFailed();
@@ -4252 +4248 @@
             notifyNatDnsChange(ptrVM.rawUVM(), "e1000", ulInstanceMax);
             notifyNatDnsChange(ptrVM.rawUVM(), "virtio-net", ulInstanceMax);
-            notifyNatDnsChange(ptrVM.rawUVM(), "virtio-net-1-dot-0", ulInstanceMax);
         }
     }
@@ -4931 +4926 @@
     AssertMsg(   (   !strcmp(pszDevice, "pcnet")
                   || !strcmp(pszDevice, "e1000")
-                  || !strcmp(pszDevice, "virtio-net")
-                  || !strcmp(pszDevice, "virtio-net-1-dot-0"))
+                  || !strcmp(pszDevice, "virtio-net"))
               && uLun == 0
               && uInstance < maxNetworkAdapters,

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2612 +2612 @@
         InsertConfigNode(pDevices, "virtio-net", &pDevVirtioNet);
 #endif /* VBOX_WITH_VIRTIO */
-#ifdef VBOX_WITH_VIRTIO_NET_1_0
-        PCFGMNODE pDevVirtioNet1_0 = NULL;          /* Virtio network devices */
-        InsertConfigNode(pDevices, "virtio-net-1-dot-0", &pDevVirtioNet1_0);
-#endif /* VBOX_WITH_VIRTIO_NET_1_0 */
         std::list<BootNic> llBootNics;
         for (ULONG uInstance = 0; uInstance < maxNetworkAdapters; ++uInstance)
@@ -2653 +2649 @@
                     break;
 #endif /* VBOX_WITH_VIRTIO */
-#ifdef VBOX_WITH_VIRTIO_NET_1_0
-                case NetworkAdapterType_Virtio_1_0:
-                    pDev = pDevVirtioNet1_0;
-                    pszAdapterName = "virtio-net-1-dot-0";
-                    break;
-#endif /* VBOX_WITH_VIRTIO_NET_1_0 */
                 default:
                     AssertMsgFailed(("Invalid network adapter type '%d' for slot '%d'", adapterType, uInstance));
@@ -2721 +2711 @@
 
             /*
-             * The virtual hardware type. PCNet supports two types, E1000 three,
+             * The virtual hardware type. PCNet supports three types, E1000 three,
              * but VirtIO only one.
              */
@@ -2745 +2735 @@
                     break;
                 case NetworkAdapterType_Virtio:
-                    break;
-                case NetworkAdapterType_Virtio_1_0:
                     break;
                 case NetworkAdapterType_Null:      AssertFailedBreak(); /* (compiler warnings) */