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

Timestamp:

Jan 9, 2020 4:31:04 AM (5 years ago)

Author:

vboxsync

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

135597

Message:

Network/DevVirtioNet_1_0.cpp: Ported skeletal framwork from VirtIO 0.9 to VirtIO 1.0 semantics. Builds but not working. See BugRef(8561) Comment #49 for details

Location:

trunk/src/VBox/Main/src-client

Files:

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

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

@@ -1525 +1525 @@
             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();
@@ -4215 +4219 @@
             notifyNatDnsChange(ptrVM.rawUVM(), "e1000", ulInstanceMax);
             notifyNatDnsChange(ptrVM.rawUVM(), "virtio-net", ulInstanceMax);
+            notifyNatDnsChange(ptrVM.rawUVM(), "virtio-net-1-dot-0", ulInstanceMax);
         }
     }
@@ -4893 +4898 @@
     AssertMsg(   (   !strcmp(pszDevice, "pcnet")
                   || !strcmp(pszDevice, "e1000")
-                  || !strcmp(pszDevice, "virtio-net"))
+                  || !strcmp(pszDevice, "virtio-net")
+                  || !strcmp(pszDevice, "virtio-net-1-dot-0"))
               && uLun == 0
               && uInstance < maxNetworkAdapters,

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

@@ -2481 +2481 @@
         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)
@@ -2518 +2522 @@
                     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));
@@ -2604 +2614 @@
                     break;
                 case NetworkAdapterType_Virtio:
+                    break;
+                case NetworkAdapterType_Virtio_1_0:
                     break;
                 case NetworkAdapterType_Null:      AssertFailedBreak(); /* (compiler warnings) */