Changeset 28406 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 16, 2010 10:45:18 AM (15 years ago)

Author:

vboxsync

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

60170

Message:

Devices, Main, FE/Qt: re-committed support for VDE virtual network switches for Linux and FreeBSD hosts. Contributed by Renzo Davoli, VirtualSquare, University of Bologna

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/VBoxGlobal.cpp (modified) (2 diffs)
• src/settings/vm/VBoxVMSettingsNetwork.cpp (modified) (7 diffs)
• src/settings/vm/VBoxVMSettingsNetwork.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -190 +190 @@
         $(if $(VBOX_WITH_SOLARIS_OSS),VBOX_WITH_SOLARIS_OSS) \
         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
-        $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT)
+        $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \
+        $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE)
 ifdef VBOX_WITH_DEBUGGER_GUI
  VirtualBox_DEFS        += VBOX_WITH_DEBUGGER_GUI

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

@@ -2155 +2155 @@
                     attType = attType.arg (tr ("Host-only adapter, '%1'",
                         "details report (network)").arg (adapter.GetHostInterface()));
+#ifdef VBOX_WITH_VDE
+                else if (type == KNetworkAttachmentType_VDE)
+                    attType = attType.arg (tr ("VDE network, '%1'",
+                        "details report (network)").arg (adapter.GetVDENetwork()));
+#endif
                 else
                     attType = attType.arg (vboxGlobal().toString (type));
@@ -3113 +3118 @@
     mNetworkAttachmentTypes [KNetworkAttachmentType_HostOnly] =
         tr ("Host-only Adapter", "NetworkAttachmentType");
+#ifdef VBOX_WITH_VDE
+    mNetworkAttachmentTypes [KNetworkAttachmentType_VDE] =
+        tr ("VDE Adapter", "NetworkAttachmentType");
+#endif
 
     mClipboardTypes [KClipboardMode_Disabled] =

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -105 +105 @@
             if (mHoiName.isEmpty()) mHoiName = QString::null;
             break;
+#ifdef VBOX_WITH_VDE
+        case KNetworkAttachmentType_VDE:
+            mVDEName = mAdapter.GetVDENetwork();
+            if (mVDEName.isEmpty()) mVDEName = QString::null;
+            break;
+#endif
         default:
             break;
@@ -145 +151 @@
             mAdapter.AttachToHostOnlyInterface();
             break;
+#ifdef VBOX_WITH_VDE
+        case KNetworkAttachmentType_VDE:
+            mAdapter.SetVDENetwork (alternativeName());
+            mAdapter.AttachToVDE();
+            break;
+#endif
         default:
             break;
@@ -257 +269 @@
             result = mHoiName;
             break;
+#ifdef VBOX_WITH_VDE
+        case KNetworkAttachmentType_VDE:
+            result = mVDEName;
+            break;
+#endif
         default:
             break;
@@ -333 +350 @@
             mCbAdapterName->setEditable (false);
             break;
+#ifdef VBOX_WITH_VDE
+        case KNetworkAttachmentType_VDE:
+            mCbAdapterName->insertItem(0, alternativeName());
+            mCbAdapterName->setEditable (true);
+            mCbAdapterName->setCompleter (0);
+            break;
+#endif
         default:
             break;
@@ -432 +456 @@
             break;
         }
+#ifdef VBOX_WITH_VDE
+        case KNetworkAttachmentType_VDE:
+        {
+            QString newName ((mCbAdapterName->itemData (mCbAdapterName->currentIndex()).toString() ==
+                              QString (emptyItemCode) &&
+                              mCbAdapterName->currentText() ==
+                              mCbAdapterName->itemText (mCbAdapterName->currentIndex())) ||
+                              mCbAdapterName->currentText().isEmpty() ?
+                              QString::null : mCbAdapterName->currentText());
+            if (mVDEName != newName)
+                mVDEName = newName;
+            break;
+        }
+#endif
         default:
             break;
@@ -548 +586 @@
     mCbAttachmentType->setItemData (4,
         mCbAttachmentType->itemText (4), Qt::ToolTipRole);
+#ifdef VBOX_WITH_VDE
+    mCbAttachmentType->insertItem (5,
+        vboxGlobal().toString (KNetworkAttachmentType_VDE));
+    mCbAttachmentType->setItemData (5,
+        KNetworkAttachmentType_VDE);
+    mCbAttachmentType->setItemData (5,
+        mCbAttachmentType->itemText (5), Qt::ToolTipRole);
+#endif
 
     /* Set the old value */

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -77 +77 @@
     QString mIntName;
     QString mHoiName;
+#ifdef VBOX_WITH_VDE
+    QString mVDEName;
+#endif
 
     bool mPolished;
@@ -93 +96 @@
     QStringList intList (bool aRefresh = false);
     QStringList hoiList (bool aRefresh = false);
+#ifdef VBOX_WITH_VDE
+    QStringList vdeList (bool aRefresh = false);
+#endif
 
 protected: