Changeset 28290 in vbox for trunk/src/VBox

Timestamp:

Apr 14, 2010 10:30:03 AM (15 years ago)

Author:

vboxsync

Message:

Devices, Main, FE/Qt: reverted r60036 for now

Location:

trunk/src/VBox

Files:

• Devices/Builtins.cpp (modified) (1 diff)
• Devices/Builtins.h (modified) (1 diff)
• Devices/Makefile.kmk (modified) (1 diff)
• Devices/Network/DrvVDE.cpp (deleted)
• Devices/Network/libvdeplug_dyn.h (deleted)
• Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.cpp (modified) (6 diffs)
• Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.h (modified) (2 diffs)
• Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.ui (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/NetworkAdapterImpl.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/NetworkAdapterImpl.h (modified) (4 diffs)
• Main/xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -238 +238 @@
         return rc;
 #endif
-               /* ENABLE VDE */
-#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvVDE);
-    if (RT_FAILURE(rc))
-        return rc;
-#endif
-               /* /ENABLE VDE */
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvIntNet);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/Builtins.h

@@ -107 +107 @@
 extern const PDMDRVREG g_DrvHostInterface;
 #endif
-#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
-extern const PDMDRVREG g_DrvVDE;
-#endif
 extern const PDMDRVREG g_DrvIntNet;
 extern const PDMDRVREG g_DrvNAT;

trunk/src/VBox/Devices/Makefile.kmk

@@ -1004 +1004 @@
 Drivers_SOURCES.linux = \
         Network/DrvTAP.cpp \
-        Network/DrvVDE.cpp \
         Audio/ossaudio.c \
         Parallel/DrvHostParallel.cpp \

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()));
-                                                               /* ENABLE VDE */
-                else if (type == KNetworkAttachmentType_VDE)
-                    attType = attType.arg (tr ("VDE network, '%1'",
-                        "details report (network)").arg (adapter.GetVDENetwork()));
-                                                               /* /ENABLE VDE */
                 else
                     attType = attType.arg (vboxGlobal().toString (type));
@@ -3118 +3113 @@
     mNetworkAttachmentTypes [KNetworkAttachmentType_HostOnly] =
         tr ("Host-only Adapter", "NetworkAttachmentType");
-               /* ENABLE VDE */
-    mNetworkAttachmentTypes [KNetworkAttachmentType_VDE] =
-        tr ("VDE Adapter", "NetworkAttachmentType");
-               /* /ENABLE VDE */
 
     mClipboardTypes [KClipboardMode_Disabled] =

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

@@ -105 +105 @@
             if (mHoiName.isEmpty()) mHoiName = QString::null;
             break;
-                                               /* ENABLE VDE */
-        case KNetworkAttachmentType_VDE:
-            mVDEName = mAdapter.GetVDENetwork();
-            if (mVDEName.isEmpty()) mVDEName = QString::null;
-            break;
-                                               /* /ENABLE VDE */
         default:
             break;
@@ -151 +145 @@
             mAdapter.AttachToHostOnlyInterface();
             break;
-                                               /* ENABLE VDE */
-                               case KNetworkAttachmentType_VDE:
-                                               mAdapter.SetVDENetwork (alternativeName());
-                                               mAdapter.AttachToVDE();
-                                               break;
-                                               /* /ENABLE VDE */
         default:
             break;
@@ -269 +257 @@
             result = mHoiName;
             break;
-                                               /* ENABLE VDE*/
-        case KNetworkAttachmentType_VDE:
-            result = mVDEName;
-            break;
-                                               /* /ENABLE VDE*/
         default:
             break;
@@ -350 +333 @@
             mCbAdapterName->setEditable (false);
             break;
-                                               /* ENABLE VDE */
-        case KNetworkAttachmentType_VDE:
-                                               mCbAdapterName->insertItem(0, alternativeName());
-            mCbAdapterName->setEditable (true);
-            mCbAdapterName->setCompleter (0);
-            break;
-                                               /* /ENABLE VDE */
         default:
             break;
@@ -456 +432 @@
             break;
         }
-                               /* ENABLE 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;
-        }
-                               /* /ENABLE VDE */
         default:
             break;
@@ -586 +548 @@
     mCbAttachmentType->setItemData (4,
         mCbAttachmentType->itemText (4), Qt::ToolTipRole);
-               /* ENABLE VDE */
-    mCbAttachmentType->insertItem (5,
-        vboxGlobal().toString (KNetworkAttachmentType_VDE));
-    mCbAttachmentType->setItemData (5,
-        KNetworkAttachmentType_VDE);
-    mCbAttachmentType->setItemData (5,
-        mCbAttachmentType->itemText (5), Qt::ToolTipRole);
-               /* /ENABLE VDE */
 
     /* Set the old value */

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

@@ -77 +77 @@
     QString mIntName;
     QString mHoiName;
-               /* ENABLE VDE */
-    QString mVDEName;
-               /* /ENABLE VDE */
 
     bool mPolished;
@@ -96 +93 @@
     QStringList intList (bool aRefresh = false);
     QStringList hoiList (bool aRefresh = false);
-    QStringList vdeList (bool aRefresh = false);
 
 protected:

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

@@ -111 +111 @@
         </property>
         <property name="whatsThis" >
-         <string>Selects the name of the network adapter for &lt;b&gt;Bridged Adapter&lt;/b&gt; or &lt;b&gt;Host-only Adapter&lt;/b&gt; attachments and the name of the network &lt;b&gt;Internal Network&lt;/b&gt; or the switch for &lt;b&gt;VDE&lt;/b&gt; attachments.</string>
+         <string>Selects the name of the network adapter for &lt;b&gt;Bridged Adapter&lt;/b&gt; or &lt;b&gt;Host-only Adapter&lt;/b&gt; attachments and the name of the network &lt;b&gt;Internal Network&lt;/b&gt; attachments.</string>
         </property>
        </widget>

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -3416 +3416 @@
         }
 
-                               /* ENABLE VDE */
-        case NetworkAttachmentType_VDE:
-        {
-            hrc = aNetworkAdapter->COMGETTER(VDENetwork)(&str);    H();
-#if 0
-                                               if (str) {
-                                                       Utf8Str strUtf8 = str;
-                                                       LogRel(("VDE Network %s\n",(char *)strUtf8.raw()));
-                                               }
-#endif
-                                               rc = CFGMR3InsertNode(pInst, "LUN#0", &pLunL0); RC_CHECK();
-                                               rc = CFGMR3InsertString(pLunL0, "Driver", "VDE");    RC_CHECK();
-                                               rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);         RC_CHECK();
-            if (str && *str) {
-                rc = CFGMR3InsertStringW(pCfg, "Network", str);         RC_CHECK();
-                                                               networkName = str;
-                                               }
-                                               rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_WhateverNone); RC_CHECK();
-                                               STR_FREE();
-            break;
-                               }
-                               /* /ENABLE VDE */
-
         default:
             AssertMsgFailed(("should not get here!\n"));
@@ -3456 +3433 @@
         case NetworkAttachmentType_HostOnly:
         case NetworkAttachmentType_NAT:
-        case NetworkAttachmentType_VDE:
         {
             if (SUCCEEDED(hrc) && SUCCEEDED(rc))

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -610 +610 @@
 }
 
-/* ENABLE VDE */
-STDMETHODIMP NetworkAdapter::COMGETTER(VDENetwork) (BSTR *aVDENetwork)
-{
-    CheckComArgOutPointerValid(aVDENetwork);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    mData->mVDENetwork.cloneTo(aVDENetwork);
-
-    return S_OK;
-}
-
-STDMETHODIMP NetworkAdapter::COMSETTER(VDENetwork) (IN_BSTR aVDENetwork)
-{
-    Bstr bstrEmpty("");
-    if (!aVDENetwork)
-        aVDENetwork = bstrEmpty;
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep (mParent);
-    if (FAILED(adep.rc())) return adep.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (mData->mVDENetwork != aVDENetwork)
-    {
-        mData.backup();
-        mData->mVDENetwork = aVDENetwork;
-
-        /* leave the lock before informing callbacks */
-        alock.release();
-
-        mParent->onNetworkAdapterChange (this, FALSE);
-    }
-
-    return S_OK;
-}
-
-/* /ENABLE VDE */
-
 STDMETHODIMP NetworkAdapter::COMGETTER(CableConnected) (BOOL *aConnected)
 {
@@ -1093 +1047 @@
     return S_OK;
 }
-
-/* ENABLE VDE */
-STDMETHODIMP NetworkAdapter::AttachToVDE()
-{
-       AutoCaller autoCaller(this);
-       if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-       /* the machine needs to be mutable */
-       AutoMutableStateDependency adep (mParent);
-       if (FAILED(adep.rc())) return adep.rc();
-
-       AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-       /* don't do anything if we're already host interface attached */
-       if (mData->mAttachmentType != NetworkAttachmentType_VDE)
-       {
-               mData.backup();
-
-               /* first detach the current attachment */
-               // Commented this for now as it reset the parameter mData->mHostInterface
-               // which is essential while changing the Attachment dynamically.
-               //detach();
-
-               mData->mAttachmentType = NetworkAttachmentType_VDE;
-
-               /* leave the lock before informing callbacks */
-               alock.release();
-
-               HRESULT rc = mParent->onNetworkAdapterChange (this, TRUE);
-               if (FAILED (rc))
-               {
-                       /* If changing the attachment failed then we can't assume
-                        * that the previous attachment will attach correctly
-                        * and thus return error along with dettaching all
-                        * attachments.
-                        */
-                       Detach();
-                       return rc;
-               }
-       }
-
-       return S_OK;
-}
-
-/* /ENABLE VDE */
 
 STDMETHODIMP NetworkAdapter::Detach()
@@ -1247 +1156 @@
         break;
 
-                               /* ENABLE VDE */
-        case NetworkAttachmentType_VDE:
-                                   mData->mVDENetwork = data.strName;
-                                   rc = AttachToVDE();
-                                   if (FAILED(rc)) return rc;
-                               break;
-                               /* ENABLE VDE */
-
-
         case NetworkAttachmentType_Null:
             rc = Detach();
@@ -1319 +1219 @@
         case NetworkAttachmentType_HostOnly:
             data.strName = mData->mHostInterface;
-        break;
-
-        case NetworkAttachmentType_VDE:
-            data.strName = mData->mVDENetwork;
         break;
     }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -11541 +11541 @@
     <const name="Internal"              value="3"/>
     <const name="HostOnly"              value="4"/>
-               <!-- ENABLE VDE -->
-    <const name="VDE"                   value="5"/>
-               <!-- /ENABLE VDE -->
   </enum>
 
@@ -11646 +11643 @@
     </attribute>
 
-               <!-- ENABLE VDE -->
-    <attribute name="VDENetwork" type="wstring">
-      <desc>
-        Name of the VDE switch the VM is attached to.
-      </desc>
-    </attribute>
-               <!-- /ENABLE VDE -->
-
     <attribute name="cableConnected" type="boolean">
       <desc>
@@ -11719 +11708 @@
       </desc>
     </method>
-
-               <!-- ENABLE VDE -->
-    <method name="attachToVDE">
-      <desc>
-        Attach the network adapter to a VDE network.
-      </desc>
-    </method>
-               <!-- /ENABLE VDE -->
 
     <method name="detach">

trunk/src/VBox/Main/include/NetworkAdapterImpl.h

@@ -50 +50 @@
                  mHostInterface("") /* cannot be null */,
                  mNATNetwork("") /* cannot be null */
-                                                                /* ENABLE VDE */
-                 , mVDENetwork("") /* can be null */
-                                                                /* /ENABLE VDE */
         {}
 
@@ -67 +64 @@
         Bstr mInternalNetwork;
         Bstr mNATNetwork;
-        /* ENABLE VDE */
-        Bstr mVDENetwork;
         ULONG mBootPriority;
     };
@@ -110 +105 @@
     STDMETHOD(COMGETTER(NATNetwork)) (BSTR *aNATNetwork);
     STDMETHOD(COMSETTER(NATNetwork)) (IN_BSTR aNATNetwork);
-               /* ENABLE VDE */
-    STDMETHOD(COMGETTER(VDENetwork)) (BSTR *aVDENetwork);
-    STDMETHOD(COMSETTER(VDENetwork)) (IN_BSTR aVDENetwork);
-               /* /ENABLE VDE */
     STDMETHOD(COMGETTER(CableConnected)) (BOOL *aConnected);
     STDMETHOD(COMSETTER(CableConnected)) (BOOL aConnected);
@@ -131 +122 @@
     STDMETHOD(AttachToInternalNetwork)();
     STDMETHOD(AttachToHostOnlyInterface)();
-               /* ENABLE VDE */
-    STDMETHOD(AttachToVDE)();
-               /* /ENABLE VDE */
     STDMETHOD(Detach)();
 

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

@@ -1889 +1889 @@
                 throw ConfigFileError(this, pelmAdapterChild, N_("Required HostOnlyInterface/@name element is missing"));
         }
-                               /* ENABLE VDE */
-        else if ((pelmAdapterChild = pelmAdapter->findChildElement("VDE")))
-        {
-            nic.mode = NetworkAttachmentType_VDE;
-            pelmAdapterChild->getAttributeValue("network", nic.strName);    // optional network name
-        }
-                               /* /ENABLE VDE */
         // else: default is NetworkAttachmentType_Null
 
@@ -3395 +3388 @@
             break;
 
-                                               /* ENABLE VDE */
-            case NetworkAttachmentType_VDE:
-                pelmNAT = pelmAdapter->createChild("VDE");
-                if (nic.strName.length())
-                    pelmNAT->setAttribute("network", nic.strName);
-            break;
-                                               /* /ENABLE VDE */
-
             default: /*case NetworkAttachmentType_Null:*/
             break;