Changeset 23994 in vbox for trunk/src

Timestamp:

Oct 22, 2009 4:13:14 PM (15 years ago)

Author:

vboxsync

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

53828

Message:

#3987: Virtio: Network adapter available in all frontends.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxShell/vboxshell.py (modified) (1 diff)
• VirtualBox/src/VBoxApplianceEditorWgt.cpp (modified) (1 diff)
• VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• VirtualBox/src/VBoxVMInformationDlg.cpp (modified) (1 diff)
• VirtualBox/src/VBoxVMSettingsNetwork.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -733 +733 @@
           type == ctx['global'].constants.NetworkAdapterType_I82543GC):
         return "e1000"
+    elif (type == ctx['global'].constants.NetworkAdapterType_Virtio):
+        return "virtio"
     elif (type == ctx['global'].constants.NetworkAdapterType_Null):
         return None

trunk/src/VBox/Frontends/VirtualBox/src/VBoxApplianceEditorWgt.cpp

@@ -413 +413 @@
                     e->addItem (vboxGlobal().toString (KNetworkAdapterType_I82545EM), KNetworkAdapterType_I82545EM);
 #endif /* VBOX_WITH_E1000 */
+#ifdef VBOX_WITH_VIRTIO
+                    e->addItem (vboxGlobal().toString (KNetworkAdapterType_Virtio), KNetworkAdapterType_Virtio);
+#endif /* VBOX_WITH_VIRTIO */
                     editor = e;
                     break;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -2734 +2734 @@
 #ifdef VBOX_WITH_VIRTIO
     mNetworkAdapterTypes [KNetworkAdapterType_Virtio] =
-        tr ("Virtio Network Adapter", "NetworkAdapterType");
+        tr ("Virtio Network Adapter (Linux guests only)", "NetworkAdapterType");
 #endif /* VBOX_WITH_VIRTIO */
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

@@ -278 +278 @@
             case KNetworkAdapterType_I82545EM:
                 name = "E1k";
+                break;
+            case KNetworkAdapterType_Virtio:
+                name = "Virtio";
                 break;
             default:

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp

@@ -496 +496 @@
         mCbAdapterType->itemText (4), Qt::ToolTipRole);
 #endif /* VBOX_WITH_E1000 */
+#ifdef VBOX_WITH_VIRTIO
+    mCbAdapterType->insertItem (5,
+        vboxGlobal().toString (KNetworkAdapterType_Virtio));
+    mCbAdapterType->setItemData (5,
+        KNetworkAdapterType_Virtio);
+    mCbAdapterType->setItemData (5,
+        mCbAdapterType->itemText (5), Qt::ToolTipRole);
+#endif /* VBOX_WITH_VIRTIO */
 
     /* Set the old value */