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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (2 diffs)
• NetworkAdapterImpl.cpp (modified) (4 diffs)
• idl/VirtualBox.xidl (modified) (3 diffs)
• include/NetworkAdapterImpl.h (modified) (4 diffs)
• xml/Settings.cpp (modified) (2 diffs)

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"));
@@ -3433 +3456 @@
         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)
 {
@@ -1047 +1093 @@
     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()
@@ -1156 +1247 @@
         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();
@@ -1219 +1319 @@
         case NetworkAttachmentType_HostOnly:
             data.strName = mData->mHostInterface;
+        break;
+
+        case NetworkAttachmentType_VDE:
+            data.strName = mData->mVDENetwork;
         break;
     }

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

@@ -11537 +11537 @@
     <const name="Internal"              value="3"/>
     <const name="HostOnly"              value="4"/>
+               <!-- ENABLE VDE -->
+    <const name="VDE"                   value="5"/>
+               <!-- /ENABLE VDE -->
   </enum>
 
@@ -11639 +11642 @@
     </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>
@@ -11704 +11715 @@
       </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 */
         {}
 
@@ -64 +67 @@
         Bstr mInternalNetwork;
         Bstr mNATNetwork;
+        /* ENABLE VDE */
+        Bstr mVDENetwork;
         ULONG mBootPriority;
     };
@@ -105 +110 @@
     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);
@@ -122 +131 @@
     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
 
@@ -3388 +3395 @@
             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;