Changeset 24546 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 10, 2009 1:24:50 PM (15 years ago)

Author:

vboxsync

Message:

virtio: string mismatch between device and some parts of main.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• ConsoleImpl2.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3178 +3178 @@
 #ifdef VBOX_WITH_VIRTIO
                 case NetworkAdapterType_Virtio:
-                    pszAdapterName = "virtio";
+                    pszAdapterName = "virtio-net";
                     break;
 #endif

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1197 +1197 @@
             case NetworkAdapterType_Virtio:
                 pDev = pDevVirtioNet;
-                pszAdapterName = "virtio";
+                pszAdapterName = "virtio-net";
                 break;
 #endif /* VBOX_WITH_VIRTIO */

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1334 +1334 @@
             else if (strTemp == "82545EM")
                 nic.type = NetworkAdapterType_I82545EM;
-            else if (strTemp == "virtio")
+            else if (strTemp == "virtio-net")
                 nic.type = NetworkAdapterType_Virtio;
             else
@@ -2654 +2654 @@
             case NetworkAdapterType_I82543GC:   pcszType = "82543GC"; break;
             case NetworkAdapterType_I82545EM:   pcszType = "82545EM"; break;
-            case NetworkAdapterType_Virtio:     pcszType = "virtio"; break;
+            case NetworkAdapterType_Virtio:     pcszType = "virtio-net"; break;
             default: /*case NetworkAdapterType_Am79C970A:*/  pcszType = "Am79C970A"; break;
         }