Changeset 37200 in vbox for trunk/src/VBox

Timestamp:

May 24, 2011 3:34:06 PM (14 years ago)

Author:

vboxsync

Message:

API+Frontends: Generic network attachment driver support which obsoletes the special case for VDE. Big API cleanup in the same area. Adapt all frontends to these changes (full implementation in VBoxManage, minimum implementation in GUI).

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/Makefile.kmk (modified) (2 diffs)
• Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (10 diffs)
• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (5 diffs)
• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (5 diffs)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (16 diffs)
• Frontends/VBoxShell/vboxshell.py (modified) (17 diffs)
• Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/selector/UIVMDesktop.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp (modified) (9 diffs)
• Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.h (modified) (4 diffs)
• Main/Makefile.kmk (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (19 diffs)
• Main/include/NetworkAdapterImpl.h (modified) (7 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (26 diffs)
• Main/src-server/ApplianceImpl.cpp (modified) (2 diffs)
• Main/src-server/ApplianceImplImport.cpp (modified) (6 diffs)
• Main/src-server/NetworkAdapterImpl.cpp (modified) (8 diffs)
• Main/xml/Settings.cpp (modified) (9 diffs)
• Main/xml/VirtualBox-settings-common.xsd (modified) (2 diffs)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -70 +70 @@
         $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
         $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \
-        $(if $(VBOX_WITH_VDE), VBOX_WITH_VDE) \
         $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
         $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -362 +362 @@
                 }
                 else
-                    RTMsgError("The NIC %d is currently disabled and thus can't change its tracefile", n);
+                    RTMsgError("The NIC %d is currently disabled and thus its tracefile can't be changed", n);
             }
         }
@@ -408 +408 @@
                 }
                 else
-                    RTMsgError("The NIC %d is currently disabled and thus can't change its trace flag", n);
+                    RTMsgError("The NIC %d is currently disabled and thus its trace flag can't be changed", n);
             }
         }
@@ -506 +506 @@
                 CHECK_ERROR(sessionMachine, SaveSettings());
         }
+        else if (!strncmp(a->argv[1], "nicproperty", 11))
+        {
+            /* Get the number of network adapters */
+            ULONG NetworkAdapterCount = getMaxNics(a->virtualBox,sessionMachine) ;
+            unsigned n = parseNum(&a->argv[1][11], NetworkAdapterCount, "NIC");
+            if (!n)
+            {
+                rc = E_FAIL;
+                break;
+            }
+            if (a->argc <= 2)
+            {
+                errorArgument("Missing argument to '%s'", a->argv[1]);
+                rc = E_FAIL;
+                break;
+            }
+
+            /* get the corresponding network adapter */
+            ComPtr<INetworkAdapter> adapter;
+            CHECK_ERROR_BREAK(sessionMachine, GetNetworkAdapter(n - 1, adapter.asOutParam()));
+            if (adapter)
+            {
+                BOOL fEnabled;
+                adapter->COMGETTER(Enabled)(&fEnabled);
+                if (fEnabled)
+                {
+                    /* Parse 'name=value' */
+                    char *pszProperty = RTStrDup(a->argv[2]);
+                    if (pszProperty)
+                    {
+                        char *pDelimiter = strchr(pszProperty, '=');
+                        if (pDelimiter)
+                        {
+                            *pDelimiter = '\0';
+
+                            Bstr bstrName = pszProperty;
+                            Bstr bstrValue = &pDelimiter[1];
+                            CHECK_ERROR(adapter, SetProperty(bstrName.raw(), bstrValue.raw()));
+                        }
+                        else
+                        {
+                            errorArgument("Invalid nicproperty%d argument '%s'", n, a->argv[2]);
+                            rc = E_FAIL;
+                        }
+                        RTStrFree(pszProperty);
+                    }
+                    else
+                    {
+                        RTStrmPrintf(g_pStdErr, "Error: Failed to allocate memory for nicproperty%d '%s'\n", n, a->argv[2]);
+                        rc = E_FAIL;
+                    }
+                    if (FAILED(rc))
+                        break;
+                }
+                else
+                    RTMsgError("The NIC %d is currently disabled and thus its properties can't be changed", n);
+            }
+        }
         else if (!strncmp(a->argv[1], "nic", 3))
         {
@@ -535 +593 @@
                     {
                         CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1);
-                        CHECK_ERROR_RET(adapter, Detach(), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_Null), 1);
                     }
                     else if (!strcmp(a->argv[2], "nat"))
@@ -542 +600 @@
                         if (a->argc == 4)
                             CHECK_ERROR_RET(adapter, COMSETTER(NATNetwork)(Bstr(a->argv[3]).raw()), 1);
-                        CHECK_ERROR_RET(adapter, AttachToNAT(), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_NAT), 1);
                     }
                     else if (  !strcmp(a->argv[2], "bridged")
@@ -554 +612 @@
                         }
                         CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1);
-                        CHECK_ERROR_RET(adapter, COMSETTER(HostInterface)(Bstr(a->argv[3]).raw()), 1);
-                        CHECK_ERROR_RET(adapter, AttachToBridgedInterface(), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(BridgedInterface)(Bstr(a->argv[3]).raw()), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_Bridged), 1);
                     }
                     else if (!strcmp(a->argv[2], "intnet"))
@@ -567 +625 @@
                         CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1);
                         CHECK_ERROR_RET(adapter, COMSETTER(InternalNetwork)(Bstr(a->argv[3]).raw()), 1);
-                        CHECK_ERROR_RET(adapter, AttachToInternalNetwork(), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_Internal), 1);
                     }
 #if defined(VBOX_WITH_NETFLT)
@@ -579 +637 @@
                         }
                         CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1);
-                        CHECK_ERROR_RET(adapter, COMSETTER(HostInterface)(Bstr(a->argv[3]).raw()), 1);
-                        CHECK_ERROR_RET(adapter, AttachToHostOnlyInterface(), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(HostOnlyInterface)(Bstr(a->argv[3]).raw()), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_HostOnly), 1);
                     }
 #endif
+                    else if (!strcmp(a->argv[2], "generic"))
+                    {
+                        if (a->argc <= 3)
+                        {
+                            errorArgument("Missing argument to '%s'", a->argv[2]);
+                            rc = E_FAIL;
+                            break;
+                        }
+                        CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(GenericDriver)(Bstr(a->argv[3]).raw()), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_Generic), 1);
+                    }
+                    /** @todo obsolete, remove eventually */
+                    else if (!strcmp(a->argv[2], "vde"))
+                    {
+                        if (a->argc <= 3)
+                        {
+                            errorArgument("Missing argument to '%s'", a->argv[2]);
+                            rc = E_FAIL;
+                            break;
+                        }
+                        CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_Generic), 1);
+                        CHECK_ERROR_RET(adapter, SetProperty((CBSTR)L"name", Bstr(a->argv[3]).raw()), 1);
+                    }
                     else
                     {
@@ -591 +674 @@
                 }
                 else
-                    RTMsgError("The NIC %d is currently disabled and thus can't change its attachment type", n);
+                    RTMsgError("The NIC %d is currently disabled and thus its attachment type can't be changed", n);
             }
         }
@@ -705 +788 @@
                     else
                     {
-                        errorArgument("Invalid --vrdeproperty argument '%s'", a->argv[2]);
+                        errorArgument("Invalid vrdeproperty argument '%s'", a->argv[2]);
                         rc = E_FAIL;
-                        break;
                     }
                     RTStrFree(pszProperty);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -194 +194 @@
                      "|hostonly"
 #endif
-#ifdef VBOX_WITH_VDE
                      "|\n"
-                     "                                        vde"
-#endif
+                     "                                        generic"
                      "]\n"
                      "                            [--nictype<1-N> Am79C970A|Am79C973"
@@ -210 +208 @@
                      "                            [--nictrace<1-N> on|off]\n"
                      "                            [--nictracefile<1-N> <filename>]\n"
+                     "                            [--nicproperty<1-N> name=[value]]\n"
                      "                            [--nicspeed<1-N> <kbps>]\n"
                      "                            [--nicbootprio<1-N> <priority>]\n"
@@ -220 +219 @@
                      "                            [--intnet<1-N> <network name>]\n"
                      "                            [--natnet<1-N> <network>|default]\n"
-#ifdef VBOX_WITH_VDE
-                     "                            [--vdenet<1-N> <network>|default]\n"
-#endif
+                     "                            [--nicgenericdrv<1-N> <driver>\n"
                      "                            [--natsettings<1-N> [<mtu>],[<socksnd>],\n"
                      "                                                [<sockrcv>],[<tcpsnd>],\n"
@@ -232 +229 @@
                      "                            [--nattftpfile<1-N> <file>]\n"
                      "                            [--nattftpserver<1-N> <ip>]\n"
+                     "                            [--natbindip<1-N> <ip>\n"
                      "                            [--natdnspassdomain<1-N> on|off]\n"
                      "                            [--natdnsproxy<1-N> on|off]\n"
@@ -385 +383 @@
                      "                            setlinkstate<1-N> on|off |\n"
 #if defined(VBOX_WITH_NETFLT)
-                     "                            nic<1-N> null|nat|bridged|intnet|hostonly\n"
+                     "                            nic<1-N> null|nat|bridged|intnet|hostonly|generic"
+                     "\n"
                      "                                     [<devicename>] |\n"
-#else /* !RT_OS_LINUX && !RT_OS_DARWIN */
-                     "                            nic<1-N> null|nat|bridged|intnet\n"
+#else /* !VBOX_WITH_NETFLT */
+                     "                            nic<1-N> null|nat|bridged|intnet|generic\n"
                      "                                     [<devicename>] |\n"
-#endif /* !RT_OS_LINUX && !RT_OS_DARWIN  */
+#endif /* !VBOX_WITH_NETFLT */
                      "                            nictrace<1-N> on|off\n"
                      "                            nictracefile<1-N> <filename>\n"
+                     "                            nicproperty<1-N> name=[value]\n"
                      "                            natpf<1-N> [<rulename>],tcp|udp,[<hostip>],\n"
                      "                                          <hostport>,[<guestip>],<guestport>\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -955 +955 @@
                     {
                         Bstr strBridgeAdp;
-                        nic->COMGETTER(HostInterface)(strBridgeAdp.asOutParam());
+                        nic->COMGETTER(BridgedInterface)(strBridgeAdp.asOutParam());
                         if (details == VMINFO_MACHINEREADABLE)
                         {
@@ -980 +980 @@
                     }
 
-#if defined(VBOX_WITH_NETFLT)
                     case NetworkAttachmentType_HostOnly:
                     {
                         Bstr strHostonlyAdp;
-                        nic->COMGETTER(HostInterface)(strHostonlyAdp.asOutParam());
+                        nic->COMGETTER(HostOnlyInterface)(strHostonlyAdp.asOutParam());
                         if (details == VMINFO_MACHINEREADABLE)
                         {
@@ -994 +993 @@
                         break;
                     }
-#endif
-#ifdef VBOX_WITH_VDE
-                    case NetworkAttachmentType_VDE:
+                    case NetworkAttachmentType_Generic:
                     {
-                        Bstr strVDEAdp;
-                        nic->COMGETTER(VDENetwork)(strVDEAdp.asOutParam());
+                        Bstr strGenericDriver;
+                        nic->COMGETTER(GenericDriver)(strGenericDriver.asOutParam());
                         if (details == VMINFO_MACHINEREADABLE)
                         {
-                            RTPrintf("vdenet%d=\"%lS\"\n", currentNIC + 1, strVDEAdp.raw());
-                            strAttachment = "VDE";
+                            RTPrintf("generic%d=\"%lS\"\n", currentNIC + 1, strGenericDriver.raw());
+                            strAttachment = "Generic";
                         }
                         else
-                            strAttachment = Utf8StrFmt("VDE Network '%lS'", strVDEAdp.raw());
+                            strAttachment = Utf8StrFmt("Generic '%lS'", strGenericDriver.raw());
                         break;
                     }
-#endif
                     default:
                         strAttachment = "unknown";
@@ -1818 +1814 @@
                  RTPrintf("\nAttached physical PCI devices:\n\n");
              }
-             
+
              for (size_t index = 0; index < assignments.size(); ++index)
              {
@@ -1837 +1833 @@
                      RTPrintf("   Host device %lS at %s attached as %s\n", DevName.raw(), szHostPciAddress, szGuestPciAddress);
              }
-             
+
              if (assignments.size() > 0 && (details != VMINFO_MACHINEREADABLE))
              {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -101 +101 @@
     MODIFYVM_NICTRACEFILE,
     MODIFYVM_NICTRACE,
+    MODIFYVM_NICPROPERTY,
     MODIFYVM_NICTYPE,
     MODIFYVM_NICSPEED,
@@ -112 +113 @@
     MODIFYVM_INTNET,
     MODIFYVM_NATNET,
-#ifdef VBOX_WITH_VDE
-    MODIFYVM_VDENET,
-#endif
+    MODIFYVM_GENERICDRV,
     MODIFYVM_NATBINDIP,
     MODIFYVM_NATSETTINGS,
@@ -233 +232 @@
     { "--nictracefile",             MODIFYVM_NICTRACEFILE,              RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--nictrace",                 MODIFYVM_NICTRACE,                  RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX },
+    { "--nicproperty",              MODIFYVM_NICPROPERTY,               RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--nictype",                  MODIFYVM_NICTYPE,                   RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--nicspeed",                 MODIFYVM_NICSPEED,                  RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_INDEX },
@@ -244 +244 @@
     { "--intnet",                   MODIFYVM_INTNET,                    RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--natnet",                   MODIFYVM_NATNET,                    RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
-#ifdef VBOX_WITH_VDE
-    { "--vdenet",                   MODIFYVM_VDENET,                    RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
-#endif
+    { "--nicgenericdrv",            MODIFYVM_GENERICDRV,                RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--natbindip",                MODIFYVM_NATBINDIP,                 RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--natsettings",              MODIFYVM_NATSETTINGS,               RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
@@ -320 +318 @@
     int rc;
     uint8_t aVals[3] = {0, 0, 0};
-    
+
     rc = RTStrToUInt8Ex(pszNext, &pszNext, 16, &aVals[0]);
     if (RT_FAILURE(rc) || pszNext == NULL || *pszNext != ':')
         return -1;
-    
+
     rc = RTStrToUInt8Ex(pszNext+1, &pszNext, 16, &aVals[1]);
     if (RT_FAILURE(rc) || pszNext == NULL || *pszNext != '.')
@@ -1038 +1036 @@
             }
 
+            case MODIFYVM_NICPROPERTY:
+            {
+                ComPtr<INetworkAdapter> nic;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                if (nic)
+                {
+                    /* Parse 'name=value' */
+                    char *pszProperty = RTStrDup(ValueUnion.psz);
+                    if (pszProperty)
+                    {
+                        char *pDelimiter = strchr(pszProperty, '=');
+                        if (pDelimiter)
+                        {
+                            *pDelimiter = '\0';
+
+                            Bstr bstrName = pszProperty;
+                            Bstr bstrValue = &pDelimiter[1];
+                            CHECK_ERROR(nic, SetProperty(bstrName.raw(), bstrValue.raw()));
+                        }
+                        else
+                        {
+                            errorArgument("Invalid --nicproperty%d argument '%s'", GetOptState.uIndex, ValueUnion.psz);
+                            rc = E_FAIL;
+                        }
+                        RTStrFree(pszProperty);
+                    }
+                    else
+                    {
+                        RTStrmPrintf(g_pStdErr, "Error: Failed to allocate memory for --nicproperty%d '%s'\n", GetOptState.uIndex, ValueUnion.psz);
+                        rc = E_FAIL;
+                    }
+                }
+                break;
+            }
             case MODIFYVM_NICTYPE:
             {
@@ -1184 +1219 @@
                 {
                     CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
-                    CHECK_ERROR(nic, Detach());
+                    CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_Null));
                 }
                 else if (!strcmp(ValueUnion.psz, "nat"))
                 {
                     CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
-                    CHECK_ERROR(nic, AttachToNAT());
+                    CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_NAT));
                 }
                 else if (  !strcmp(ValueUnion.psz, "bridged")
@@ -1195 +1230 @@
                 {
                     CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
-                    CHECK_ERROR(nic, AttachToBridgedInterface());
+                    CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_Bridged));
                 }
                 else if (!strcmp(ValueUnion.psz, "intnet"))
                 {
                     CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
-                    CHECK_ERROR(nic, AttachToInternalNetwork());
-                }
-#if defined(VBOX_WITH_NETFLT)
+                    CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_Internal));
+                }
                 else if (!strcmp(ValueUnion.psz, "hostonly"))
                 {
 
                     CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
-                    CHECK_ERROR(nic, AttachToHostOnlyInterface());
-                }
-#endif
-#ifdef VBOX_WITH_VDE
-                else if (!strcmp(ValueUnion.psz, "vde"))
+                    CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_HostOnly));
+                }
+                else if (!strcmp(ValueUnion.psz, "generic"))
                 {
 
                     CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
-                    CHECK_ERROR(nic, AttachToVDE());
-                }
-#endif
+                    CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_Generic));
+                }
                 else
                 {
@@ -1238 +1269 @@
 
             case MODIFYVM_BRIDGEADAPTER:
-            case MODIFYVM_HOSTONLYADAPTER:
-            {
-                ComPtr<INetworkAdapter> nic;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                /** @todo NULL string deprecated */
+            {
+                ComPtr<INetworkAdapter> nic;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
                 /* remove it? */
                 if (!strcmp(ValueUnion.psz, "none"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(HostInterface)(NULL));
-                }
-                else
-                {
-                    CHECK_ERROR(nic, COMSETTER(HostInterface)(Bstr(ValueUnion.psz).raw()));
-                }
-                break;
-            }
-
-            case MODIFYVM_INTNET:
-            {
-                ComPtr<INetworkAdapter> nic;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                /** @todo NULL string deprecated */
+                    CHECK_ERROR(nic, COMSETTER(BridgedInterface)((CBSTR)L""));
+                }
+                else
+                {
+                    CHECK_ERROR(nic, COMSETTER(BridgedInterface)(Bstr(ValueUnion.psz).raw()));
+                }
+                break;
+            }
+
+            case MODIFYVM_HOSTONLYADAPTER:
+            {
+                ComPtr<INetworkAdapter> nic;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
                 /* remove it? */
                 if (!strcmp(ValueUnion.psz, "none"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(InternalNetwork)(NULL));
+                    CHECK_ERROR(nic, COMSETTER(HostOnlyInterface)((CBSTR)L""));
+                }
+                else
+                {
+                    CHECK_ERROR(nic, COMSETTER(HostOnlyInterface)(Bstr(ValueUnion.psz).raw()));
+                }
+                break;
+            }
+
+            case MODIFYVM_INTNET:
+            {
+                ComPtr<INetworkAdapter> nic;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                /* remove it? */
+                if (!strcmp(ValueUnion.psz, "none"))
+                {
+                    CHECK_ERROR(nic, COMSETTER(InternalNetwork)((CBSTR)L""));
                 }
                 else
@@ -1278 +1325 @@
             }
 
-#ifdef VBOX_WITH_VDE
-            case MODIFYVM_VDENET:
-            {
-                ComPtr<INetworkAdapter> nic;
-
-                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
-                ASSERT(nic);
-
-                /** @todo NULL string deprecated */
-                /* remove it? */
-                if (!strcmp(ValueUnion.psz, "default"))
-                {
-                    CHECK_ERROR(nic, COMSETTER(VDENetwork)(NULL));
-                }
-                else
-                {
-                    CHECK_ERROR(nic, COMSETTER(VDENetwork)(Bstr(ValueUnion.psz).raw()));
-                }
-                break;
-            }
-#endif
+            case MODIFYVM_GENERICDRV:
+            {
+                ComPtr<INetworkAdapter> nic;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMSETTER(GenericDriver)(Bstr(ValueUnion.psz).raw()));
+                break;
+            }
+
             case MODIFYVM_NATNET:
             {
@@ -1558 +1595 @@
                 if (!strcmp(ValueUnion.psz, "auto"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(MACAddress)(NULL));
+                    CHECK_ERROR(nic, COMSETTER(MACAddress)((CBSTR)L""));
                 }
                 else
@@ -1882 +1919 @@
                     }
                     else
-                        CHECK_ERROR(vrdeServer, COMSETTER(VRDEExtPack)(NULL));
+                        CHECK_ERROR(vrdeServer, COMSETTER(VRDEExtPack)((CBSTR)L""));
                 }
                 break;
@@ -1998 +2035 @@
                     }
                     else
-                        CHECK_ERROR(vrdeServer, COMSETTER(AuthLibrary)(NULL));
+                        CHECK_ERROR(vrdeServer, COMSETTER(AuthLibrary)((CBSTR)L""));
                 }
                 break;
@@ -2086 +2123 @@
             {
                 if (!strcmp(ValueUnion.psz, "default"))
-                    CHECK_ERROR(machine, COMSETTER(SnapshotFolder)(NULL));
+                    CHECK_ERROR(machine, COMSETTER(SnapshotFolder)((CBSTR)L""));
                 else
                     CHECK_ERROR(machine, COMSETTER(SnapshotFolder)(Bstr(ValueUnion.psz).raw()));
@@ -2215 +2252 @@
                 iHostAddr = parsePci(ValueUnion.psz);
                 iGuestAddr = pAt != NULL ? parsePci(pAt + 1) : iHostAddr;
-                
+
                 if (iHostAddr == -1 || iGuestAddr == -1)
                 {

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

@@ -818 +818 @@
     def __init__(self, parent, mach):
         XPathNodeHolder.__init__(self, parent, mach, 'nics', XPathNodeVM, 'nics')
-        self.maxNic = self.getCtx()['vb'].systemProperties.networkAdapterCount
+        self.maxNic = self.getCtx()['vb'].systemProperties.getMaxNetworkAdapters(self.obj.chipsetType)
     def enum(self):
         children = []
@@ -1485 +1485 @@
    props = vb.systemProperties
    print "Machines: %s" %(colPath(ctx,props.defaultMachineFolder))
-   print "HDDs:     %s" %(colPath(ctx,props.defaultHardDiskFolder))
 
    #print "Global shared folders:"
@@ -2623 +2622 @@
                 msg += ', '
             if int(nat.aliasMode) & aliaskey:
-                msg += '{0}: {1}'.format(aliasmode, 'on')
+                msg += '%d: %s' % (aliasmode, 'on')
             else:
-                msg += '{0}: {1}'.format(aliasmode, 'off')
+                msg += '%d: %s' % (aliasmode, 'off')
         msg += ')'
         return (0, [msg])
@@ -2653 +2652 @@
         if tcpsndwnd == 0: tcpsndwnd = 64
         if tcprcvwnd == 0: tcprcvwnd = 64
-        msg = 'mtu:{0} socket(snd:{1}, rcv:{2}) tcpwnd(snd:{3}, rcv:{4})'.format(mtu, socksndbuf, sockrcvbuf, tcpsndwnd, tcprcvwnd);
+        msg = 'mtu:%s socket(snd:%s, rcv:%s) tcpwnd(snd:%s, rcv:%s)' % (mtu, socksndbuf, sockrcvbuf, tcpsndwnd, tcprcvwnd);
         return (0, [msg])
     else:
         if args[1] < 16000:
-            print 'invalid mtu value ({0} no in range [65 - 16000])'.format(args[1])
+            print 'invalid mtu value (%s not in range [65 - 16000])' % (args[1])
             return (1, None)
         for i in range(2, len(args)):
             if not args[i].isdigit() or int(args[i]) < 8 or int(args[i]) > 1024:
-                print 'invalid {0} parameter ({1} not in range [8-1024])'.format(i, args[i])
+                print 'invalid %s parameter (%i not in range [8-1024])' % (i, args[i])
                 return (1, None)
         a = [args[1]]
@@ -2682 +2681 @@
     yesno = {0: 'off', 1: 'on'}
     if len(args) == 1:
-        msg = 'passdomain:{0}, proxy:{1}, usehostresolver:{2}'.format(yesno[int(nat.dnsPassDomain)], yesno[int(nat.dnsProxy)], yesno[int(nat.dnsUseHostResolver)])
+        msg = 'passdomain:%s, proxy:%s, usehostresolver:%s' % (yesno[int(nat.dnsPassDomain)], yesno[int(nat.dnsProxy)], yesno[int(nat.dnsUseHostResolver)])
         return (0, [msg])
     else:
@@ -2702 +2701 @@
             server = nat.network
             if server is None:
-                server = '10.0.{0}/24'.format(int(nicnum) + 2)
+                server = '10.0.%d/24' % (int(nicnum) + 2)
             (server,mask) = server.split('/')
             while server.count('.') != 3:
                 server += '.0'
             (a,b,c,d) = server.split('.')
-            server = '{0}.{1}.{2}.4'.format(a,b,c)
+            server = '%d.%d.%d.4' % (a,b,c)
         prefix = nat.tftpPrefix
         if prefix is None:
-            prefix = '{0}/TFTP/'.format(ctx['vb'].homeFolder)
+            prefix = '%s/TFTP/' % (ctx['vb'].homeFolder)
         bootfile = nat.tftpBootFile
         if bootfile is None:
-            bootfile = '{0}.pxe'.format(mach.name)
-        msg = 'server:{0}, prefix:{1}, bootfile:{2}'.format(server, prefix, bootfile)
+            bootfile = '%s.pxe' % (mach.name)
+        msg = 'server:%s, prefix:%s, bootfile:%s' % (server, prefix, bootfile)
         return (0, [msg])
     else:
@@ -2746 +2745 @@
         for pf in pfs:
             (pfnme, pfp, pfhip, pfhp, pfgip, pfgp) = str(pf).split(',')
-            msg.append('{0}: {1} {2}:{3} => {4}:{5}'.format(pfnme, proto[int(pfp)], pfhip, pfhp, pfgip, pfgp))
+            msg.append('%s: %s %s:%s => %s:%s' % (pfnme, proto[int(pfp)], pfhip, pfhp, pfgip, pfgp))
         return (0, msg) # msg is array
     else:
@@ -2785 +2784 @@
             msg = '\'%s\'' % (nat.network)
         else:
-            msg = '10.0.{0}.0/24'.format(int(nicnum) + 2)
+            msg = '10.0.%d.0/24' % (int(nicnum) + 2)
         return (0, [msg])
     else:
@@ -2825 +2824 @@
         print "please specify vm"
         return 0
-    if len(args) < 3 or not args[2].isdigit() or int(args[2]) not in range(0, ctx['vb'].systemProperties.networkAdapterCount):
-        print 'please specify adapter num {0} isn\'t in range [0-{1}]'.format(args[2], ctx['vb'].systemProperties.networkAdapterCount)
+    if len(args) < 3 or not args[2].isdigit() or int(args[2]) not in range(0, ctx['vb'].systemProperties.getMaxNetworkAdapters(mach.chipsetType)):
+        print 'please specify adapter num %d isn\'t in range [0-%d]' % (args[2], ctx['vb'].systemProperties.getMaxNetworkAdapters(mach.chipsetType))
         return 0
     nicnum = int(args[2])
@@ -2852 +2851 @@
     elif report is not None:
         for r in report:
-            msg ='{0} nic{1} {2}: {3}'.format(mach.name, nicnum, func, r)
+            msg ='%s nic%d %s: %s' % (mach.name, nicnum, func, r)
             print msg
     return 0
@@ -2887 +2886 @@
     else:
         if not args[1].isdigit():
-            print '%s isn\'t a number'.format(args[1])
+            print '%s isn\'t a number' % (args[1])
             print (1, None)
         adapter.lineSpeed = int(args[1])
@@ -2924 +2923 @@
 def nicAttachmentSubCmd(ctx, vm, nicnum, adapter, args):
     '''
-    usage: nic <vm> <nicnum> attachment [Null|NAT|Bridged <interface>|Internal <name>|HostOnly <interface>]
+    usage: nic <vm> <nicnum> attachment [Null|NAT|Bridged <interface>|Internal <name>|HostOnly <interface>
     '''
     if len(args) == 1:
@@ -2930 +2929 @@
             ctx['global'].constants.NetworkAttachmentType_Null: ('Null', ''),
             ctx['global'].constants.NetworkAttachmentType_NAT: ('NAT', ''),
-            ctx['global'].constants.NetworkAttachmentType_Bridged: ('Bridged', adapter.hostInterface),
+            ctx['global'].constants.NetworkAttachmentType_Bridged: ('Bridged', adapter.bridgedInterface),
             ctx['global'].constants.NetworkAttachmentType_Internal: ('Internal', adapter.internalNetwork),
-            ctx['global'].constants.NetworkAttachmentType_HostOnly: ('HostOnly', adapter.hostInterface),
-            #ctx['global'].constants.NetworkAttachmentType_VDE: ('VDE', adapter.VDENetwork)
+            ctx['global'].constants.NetworkAttachmentType_HostOnly: ('HostOnly', adapter.hostOnlyInterface),
+            # @todo show details of the generic network attachment type
+            ctx['global'].constants.NetworkAttachmentType_Generic: ('Generic', ''),
         }
         import types
@@ -2941 +2941 @@
             t = adapter.attachmentType
         (r, p) = nicAttachmentType[t]
-        return (0, 'attachment:{0}, name:{1}'.format(r, p))
+        return (0, 'attachment:%s, name:%s' % (r, p))
     else:
         nicAttachmentType = {
@@ -2947 +2947 @@
                 'v': lambda: len(args) == 2,
                 'p': lambda: 'do nothing',
-                'f': lambda: adapter.detach()},
+                'f': lambda: ctx['global'].constants.NetworkAttachmentType_Null},
             'NAT': {
                 'v': lambda: len(args) == 2,
                 'p': lambda: 'do nothing',
-                'f': lambda: adapter.attachToNAT()},
+                'f': lambda: ctx['global'].constants.NetworkAttachmentType_NAT},
             'Bridged': {
                 'v': lambda: len(args) == 3,
-                'p': lambda: adapter.__setattr__('hostInterface', args[2]),
-                'f': lambda: adapter.attachToBridgedInterface()},
+                'p': lambda: adapter.__setattr__('bridgedInterface', args[2]),
+                'f': lambda: ctx['global'].constants.NetworkAttachmentType_Bridged},
             'Internal': {
                 'v': lambda: len(args) == 3,
                 'p': lambda: adapter.__setattr__('internalNetwork', args[2]),
-                'f': lambda: adapter.attachToInternalNetwork()},
+                'f': lambda: ctx['global'].constants.NetworkAttachmentType_Internal},
             'HostOnly': {
                 'v': lambda: len(args) == 2,
-                'p': lambda: adapter.__setattr__('hostInterface', args[2]),
-                'f': lambda: adapter.attachToHostOnlyInterface()},
-            'VDE': {
+                'p': lambda: adapter.__setattr__('hostOnlyInterface', args[2]),
+                'f': lambda: ctx['global'].constants.NetworkAttachmentType_HostOnly},
+            # @todo implement setting the properties of a generic attachment
+            'Generic': {
                 'v': lambda: len(args) == 3,
-                'p': lambda: adapter.__setattr__('VDENetwork', args[2]),
-                'f': lambda: adapter.attachToVDE()}
+                'p': lambda: 'do nothing',
+                'f': lambda: ctx['global'].constants.NetworkAttachmentType_Generic}
         }
         if args[1] not in nicAttachmentType.keys():
-            print '{0} not in acceptable values ({1})'.format(args[1], nicAttachmentType.keys())
+            print '%s not in acceptable values (%s)' % (args[1], nicAttachmentType.keys())
             return (1, None)
         if not nicAttachmentType[args[1]]['v']():
@@ -2976 +2977 @@
             return (1, None)
         nicAttachmentType[args[1]]['p']()
-        nicAttachmentType[args[1]]['f']()
+        adapter.attachmentType = nicAttachmentType[args[1]]['f']()
     return (0, None)
 
@@ -3010 +3011 @@
 
     if    len(args) < 3 \
-       or int(args[2]) not in range(0, ctx['vb'].systemProperties.networkAdapterCount):
-            print 'please specify adapter num %d isn\'t in range [0-%d]'%(args[2], ctx['vb'].systemProperties.networkAdapterCount)
+       or int(args[2]) not in range(0, ctx['vb'].systemProperties.getMaxNetworkAdapters(vm.chipsetType)):
+            print 'please specify adapter num %d isn\'t in range [0-%d]'%(args[2], ctx['vb'].systemProperties.getMaxNetworkAdapters(vm.chipsetType))
             return 0
     nicnum = int(args[2])

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

@@ -129 +129 @@
         $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \
         $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \
+        $(if $(VBOX_WITH_UDPTUNNEL),VBOX_WITH_UDPTUNNEL) \
         $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI) \
         $(if $(VBOX_GUI_WITH_PIDFILE),VBOX_GUI_WITH_PIDFILE) \

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

@@ -1829 +1829 @@
                 if (type == KNetworkAttachmentType_Bridged)
                     attType = attType.arg (tr ("Bridged adapter, %1",
-                        "details report (network)").arg (adapter.GetHostInterface()));
+                        "details report (network)").arg (adapter.GetBridgedInterface()));
                 else if (type == KNetworkAttachmentType_Internal)
                     attType = attType.arg (tr ("Internal network, '%1'",
@@ -1835 +1835 @@
                 else if (type == KNetworkAttachmentType_HostOnly)
                     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
+                        "details report (network)").arg (adapter.GetHostOnlyInterface()));
+                else if (type == KNetworkAttachmentType_Generic)
+                    attType = attType.arg (tr ("Generic, '%1'",
+                        "details report (network)").arg (adapter.GetGenericDriver()));
                 else
                     attType = attType.arg (vboxGlobal().toString (type));
@@ -2969 +2967 @@
     mNetworkAttachmentTypes [KNetworkAttachmentType_HostOnly] =
         tr ("Host-only Adapter", "NetworkAttachmentType");
-#ifdef VBOX_WITH_VDE
-    mNetworkAttachmentTypes [KNetworkAttachmentType_VDE] =
-        tr ("VDE Adapter", "NetworkAttachmentType");
-#endif
+    mNetworkAttachmentTypes [KNetworkAttachmentType_Generic] =
+        tr ("Generic", "NetworkAttachmentType");
 
     mNetworkAdapterPromiscModePolicyTypes [KNetworkAdapterPromiscModePolicy_Deny] =

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -740 +740 @@
                     if (type == KNetworkAttachmentType_Bridged)
                         attType = attType.arg(tr("Bridged adapter, %1",
-                                                 "details report (network)").arg(adapter.GetHostInterface()));
+                                                 "details report (network)").arg(adapter.GetBridgedInterface()));
                     else if (type == KNetworkAttachmentType_Internal)
                         attType = attType.arg(tr("Internal network, '%1'",
@@ -746 +746 @@
                     else if (type == KNetworkAttachmentType_HostOnly)
                         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
+                                                 "details report (network)").arg(adapter.GetHostOnlyInterface()));
+                    else if (type == KNetworkAttachmentType_Generic)
+                        attType = attType.arg(tr("Generic, '%1'",
+                                                 "details report (network)").arg(adapter.GetGenericDriver()));
                     else
                         attType = attType.arg(vboxGlobal().toString(type));

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -113 +113 @@
 
     /* Load alternative name: */
-    switch (attachmentType())
-    {
-        case KNetworkAttachmentType_Bridged:
-            m_strBrgName = adapterData.m_strBridgedAdapterName;
-            if (m_strBrgName.isEmpty()) m_strBrgName = QString();
-            break;
-        case KNetworkAttachmentType_Internal:
-            m_strIntName = adapterData.m_strInternalNetworkName;
-            if (m_strIntName.isEmpty()) m_strIntName = QString();
-            break;
-        case KNetworkAttachmentType_HostOnly:
-            m_strHoiName = adapterData.m_strHostInterfaceName;
-            if (m_strHoiName.isEmpty()) m_strHoiName = QString();
-            break;
-#ifdef VBOX_WITH_VDE
-        case KNetworkAttachmentType_VDE:
-            mVDEName = adapterData.m_strVDENetworkName;
-            if (mVDEName.isEmpty()) mVDEName = QString();
-            break;
-#endif /* VBOX_WITH_VDE */
-        default:
-            break;
-    }
+    m_strBrgName = adapterData.m_strBridgedAdapterName;
+    if (m_strBrgName.isEmpty())
+        m_strBrgName = QString();
+
+    m_strIntName = adapterData.m_strInternalNetworkName;
+    if (m_strIntName.isEmpty())
+        m_strIntName = QString();
+
+    m_strHoiName = adapterData.m_strHostInterfaceName;
+    if (m_strHoiName.isEmpty())
+        m_strHoiName = QString();
+
+    m_strGenericDriver = adapterData.m_strGenericDriver;
+    if (m_strGenericDriver.isEmpty())
+        m_strGenericDriver = QString();
+
     sltUpdateAttachmentAlternative();
 
@@ -179 +172 @@
             adapterData.m_strHostInterfaceName = alternativeName();
             break;
-#ifdef VBOX_WITH_VDE
-        case KNetworkAttachmentType_VDE:
-            adapterData.m_strVDENetworkName = alternativeName();
-            break;
-#endif /* VBOX_WITH_VDE */
+        case KNetworkAttachmentType_Generic:
+            adapterData.m_strGenericDriver = alternativeName();
+            break;
         default:
             break;
@@ -298 +289 @@
             strResult = m_strHoiName;
             break;
-#ifdef VBOX_WITH_VDE
-        case KNetworkAttachmentType_VDE:
-            strResult = mVDEName;
-            break;
-#endif
+        case KNetworkAttachmentType_Generic:
+            strResult = m_strGenericDriver;
+            break;
         default:
             break;
@@ -367 +356 @@
             m_pAdapterNameCombo->setEditable(false);
             break;
-#ifdef VBOX_WITH_VDE
-        case KNetworkAttachmentType_VDE:
+        case KNetworkAttachmentType_Generic:
             m_pAdapterNameCombo->insertItem(0, alternativeName());
             m_pAdapterNameCombo->setEditable(true);
             m_pAdapterNameCombo->setCompleter(0);
             break;
-#endif
         default:
             break;
@@ -476 +463 @@
             break;
         }
-#ifdef VBOX_WITH_VDE
-        case KNetworkAttachmentType_VDE:
+        case KNetworkAttachmentType_Generic:
         {
             QString newName((m_pAdapterNameCombo->itemData(m_pAdapterNameCombo->currentIndex()).toString() ==
@@ -485 +471 @@
                              m_pAdapterNameCombo->currentText().isEmpty() ?
                              QString::null : m_pAdapterNameCombo->currentText());
-            if (mVDEName != newName)
-                mVDEName = newName;
-            break;
-        }
-#endif
+            if (m_strGenericDriver != newName)
+                m_strGenericDriver = newName;
+            break;
+        }
         default:
             break;
@@ -555 +540 @@
         m_pAttachmentTypeCombo->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeCombo->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
         ++iAttachmentTypeIndex;
-#ifdef VBOX_WITH_VDE
-        RTLDRMOD hLdrDummy;
-        if (RT_SUCCESS(RTLdrLoad(VBOX_LIB_VDE_PLUG_NAME, &hLdrDummy)))
-        {
-            m_pAttachmentTypeCombo->insertItem(iAttachmentTypeIndex, vboxGlobal().toString(KNetworkAttachmentType_VDE));
-            m_pAttachmentTypeCombo->setItemData(iAttachmentTypeIndex, KNetworkAttachmentType_VDE);
-            m_pAttachmentTypeCombo->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeCombo->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
-            ++iAttachmentTypeIndex;
-        }
-#endif
+        m_pAttachmentTypeCombo->insertItem(iAttachmentTypeIndex, vboxGlobal().toString(KNetworkAttachmentType_Generic));
+        m_pAttachmentTypeCombo->setItemData(iAttachmentTypeIndex, KNetworkAttachmentType_Generic);
+        m_pAttachmentTypeCombo->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeCombo->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
+        ++iAttachmentTypeIndex;
 
         /* Restore the previously selected attachment type: */
@@ -774 +753 @@
             adapterData.m_fAdapterEnabled = adapter.GetEnabled();
             adapterData.m_attachmentType = adapter.GetAttachmentType();
-            switch (adapterData.m_attachmentType)
-            {
-                case KNetworkAttachmentType_Bridged:
-                    adapterData.m_strBridgedAdapterName = adapter.GetHostInterface();
-                    if (adapterData.m_strBridgedAdapterName.isEmpty())
-                        adapterData.m_strBridgedAdapterName = QString();
-                    break;
-                case KNetworkAttachmentType_Internal:
-                    adapterData.m_strInternalNetworkName = adapter.GetInternalNetwork();
-                    if (adapterData.m_strInternalNetworkName.isEmpty())
-                        adapterData.m_strInternalNetworkName = QString();
-                    break;
-                case KNetworkAttachmentType_HostOnly:
-                    adapterData.m_strHostInterfaceName = adapter.GetHostInterface();
-                    if (adapterData.m_strHostInterfaceName.isEmpty())
-                        adapterData.m_strHostInterfaceName = QString();
-                    break;
-#ifdef VBOX_WITH_VDE
-                case KNetworkAttachmentType_VDE:
-                    adapterData.m_strVDENetworkName = adapter.GetVDENetwork();
-                    if (adapterData.m_strVDENetworkName.isEmpty())
-                        adapterData.m_strVDENetworkName = QString();
-                    break;
-#endif /* VBOX_WITH_VDE */
-                default:
-                    break;
-            }
+
+            adapterData.m_strBridgedAdapterName = adapter.GetBridgedInterface();
+            if (adapterData.m_strBridgedAdapterName.isEmpty())
+                adapterData.m_strBridgedAdapterName = QString();
+
+            adapterData.m_strInternalNetworkName = adapter.GetInternalNetwork();
+            if (adapterData.m_strInternalNetworkName.isEmpty())
+                adapterData.m_strInternalNetworkName = QString();
+
+            adapterData.m_strHostInterfaceName = adapter.GetHostOnlyInterface();
+            if (adapterData.m_strHostInterfaceName.isEmpty())
+                adapterData.m_strHostInterfaceName = QString();
+
+            adapterData.m_strGenericDriver = adapter.GetGenericDriver();
+            if (adapterData.m_strGenericDriver.isEmpty())
+                adapterData.m_strGenericDriver = QString();
 
             /* Gather advanced options: */
@@ -919 +887 @@
                         switch (adapterData.m_attachmentType)
                         {
-                            case KNetworkAttachmentType_Null:
-                                adapter.Detach();
-                                break;
-                            case KNetworkAttachmentType_NAT:
-                                adapter.AttachToNAT();
-                                break;
                             case KNetworkAttachmentType_Bridged:
-                                adapter.SetHostInterface(adapterData.m_strBridgedAdapterName);
-                                adapter.AttachToBridgedInterface();
+                                adapter.SetBridgedInterface(adapterData.m_strBridgedAdapterName);
                                 break;
                             case KNetworkAttachmentType_Internal:
                                 adapter.SetInternalNetwork(adapterData.m_strInternalNetworkName);
-                                adapter.AttachToInternalNetwork();
                                 break;
                             case KNetworkAttachmentType_HostOnly:
-                                adapter.SetHostInterface(adapterData.m_strHostInterfaceName);
-                                adapter.AttachToHostOnlyInterface();
+                                adapter.SetHostOnlyInterface(adapterData.m_strHostInterfaceName);
                                 break;
-#ifdef VBOX_WITH_VDE
-                            case KNetworkAttachmentType_VDE:
-                                adapter.SetVDENetwork(adapterData.m_strVDENetworkName);
-                                adapter.AttachToVDE();
+                            case KNetworkAttachmentType_Generic:
+                                adapter.SetGenericDriver(adapterData.m_strGenericDriver);
                                 break;
-#endif /* VBOX_WITH_VDE */
                             default:
                                 break;
                         }
+                        adapter.SetAttachmentType(adapterData.m_attachmentType);
                         /* Advanced attributes: */
                         adapter.SetPromiscModePolicy(adapterData.m_promiscuousMode);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.h

@@ -43 +43 @@
         , m_strInternalNetworkName(QString())
         , m_strHostInterfaceName(QString())
-#ifdef VBOX_WITH_VDE
-        , m_strVDENetworkName(QString())
-#endif /* VBOX_WITH_VDE */
+        , m_strGenericDriver(QString())
         , m_strMACAddress(QString())
         , m_fCableConnected(false)
@@ -60 +58 @@
                (m_strInternalNetworkName == other.m_strInternalNetworkName) &&
                (m_strHostInterfaceName == other.m_strHostInterfaceName) &&
-#ifdef VBOX_WITH_VDE
-               (m_strVDENetworkName == other.m_strVDENetworkName) &&
-#endif /* VBOX_WITH_VDE */
+               (m_strGenericDriver == other.m_strGenericDriver) &&
                (m_strMACAddress == other.m_strMACAddress) &&
                (m_fCableConnected == other.m_fCableConnected) &&
@@ -79 +75 @@
     QString m_strInternalNetworkName;
     QString m_strHostInterfaceName;
-#ifdef VBOX_WITH_VDE
-    QString m_strVDENetworkName;
-#endif /* VBOX_WITH_VDE */
+    QString m_strGenericDriver;
     QString m_strMACAddress;
     bool m_fCableConnected;
@@ -149 +143 @@
     QString m_strIntName;
     QString m_strHoiName;
-#ifdef VBOX_WITH_VDE
-    QString mVDEName;
-#endif /* VBOX_WITH_VDE */
+    QString m_strGenericDriver;
 
     bool m_fPolished;

trunk/src/VBox/Main/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -62 +62 @@
         $(if $(VBOX_WITH_GUEST_PROPS_RDONLY_GUEST),VBOX_WITH_GUEST_PROPS_RDONLY_GUEST,) \
         $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL,) \
-        $(if $(VBOX_WITH_HOSTNETIF_API),VBOX_WITH_HOSTNETIF_API,) \
-        $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE,)
+        $(if $(VBOX_WITH_HOSTNETIF_API),VBOX_WITH_HOSTNETIF_API,)
 
 # Unconditionally enable the new semaphore key generation code

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

@@ -272 +272 @@
       <td>
         Returned if a memory pointer for the output argument is invalid (for
-        example, @c null). Note that when pointers representing input
-        arguments (such as strings) are invalid, E_INVALIDARG is returned.
+        example, @c null). When pointers representing input arguments (such
+        as strings) are invalid, E_INVALIDARG is returned.
       </td>
       </tr>
@@ -559 +559 @@
       executed), only a few machine settings can be modified. Methods working
       with such settings contain an explicit note about that. An attempt to
-      change any oter setting or perform a modifying operation during this time
+      change any other setting or perform a modifying operation during this time
       will result in the @c VBOX_E_INVALID_VM_STATE error.
 
@@ -1207 +1207 @@
       through a single IVirtualBoxErrorInfo object set after method invocation.
 
-      Note that errors are stored to a chain in the reverse order, i.e. the
+      <note>errors are stored to a chain in the reverse order, i.e. the
       initial error object you query right after method invocation is the last
       error set by the callee, the object it points to in the @a next attribute
       is the previous error and so on, up to the first error (which is the last
-      in the chain).
+      in the chain).</note>
     </desc>
 
@@ -1768 +1768 @@
         format and location for medium data.
 
-        Note that the actual storage unit is not created by this method. In
-        order to do it, and before you are able to attach the created medium
-        to virtual machines, you must call one of the following methods to
+        The actual storage unit is not created by this method. In order to
+        do it, and before you are able to attach the created medium to
+        virtual machines, you must call one of the following methods to
         allocate a format-specific storage unit at the specified location:
         <ul>
@@ -10226 +10226 @@
     </method>
 
-    <!-- storage methods -->
+    <!-- property methods -->
 
     <method name="getProperty">
@@ -10235 +10235 @@
         be obtained with <link to="IMediumFormat::describeProperties"/>.
 
-        Note that if this method returns an empty string in @a value, the
-        requested property is supported but currently not assigned any value.
+        <note>If this method returns an empty string in @a value, the requested
+        property is supported but currently not assigned any value.</note>
 
         <result name="VBOX_E_OBJECT_NOT_FOUND">
@@ -10258 +10258 @@
         be obtained with <link to="IMediumFormat::describeProperties"/>.
 
-        Note that setting the property value to @c null or an empty string is
+        <note>Setting the property value to @c null or an empty string is
         equivalent to deleting the existing value. A default value (if it is
         defined for this property) will be used by the format backend in this
-        case.
+        case.</note>
 
         <result name="VBOX_E_OBJECT_NOT_FOUND">
@@ -10282 +10282 @@
         The names of the properties to get are specified using the @a names
         argument which is a list of comma-separated property names or
-        an empty string if all properties are to be returned. Note that currently
-        the value of this argument is ignored and the method always returns all
-        existing properties.
+        an empty string if all properties are to be returned.
+        <note>Currently the value of this argument is ignored and the method
+        always returns all existing properties.</note>
 
         The list of all properties supported by the given medium format can
@@ -10291 +10291 @@
         The method returns two arrays, the array of property names corresponding
         to the @a names argument and the current values of these properties.
-        Both arrays have the same number of elements with each elemend at the
+        Both arrays have the same number of elements with each element at the
         given index in the first array corresponds to an element at the same
         index in the second array.
 
-        Note that for properties that do not have assigned values,
-        an empty string is returned at the appropriate index in the
-        @a returnValues array.
+        For properties that do not have assigned values, an empty string is
+        returned at the appropriate index in the @a returnValues array.
 
       </desc>
@@ -10319 +10318 @@
         The names of the properties to set are passed in the @a names
         array along with the new values for them in the @a values array. Both
-        arrays have the same number of elements with each elemend at the given
+        arrays have the same number of elements with each element at the given
         index in the first array corresponding to an element at the same index
         in the second array.
@@ -10328 +10327 @@
 
         Using this method over <link to="#setProperty"/> is preferred if you
-        need to set several properties at once since it will result into less
-        IPC calls.
+        need to set several properties at once since it is more efficient.
 
         The list of all properties supported by the given medium format can
         be obtained with <link to="IMediumFormat::describeProperties"/>.
 
-        Note that setting the property value to @c null or an empty string is
-        equivalent to deleting the existing value. A default value (if it is
-        defined for this property) will be used by the format backend in this
-        case.
+        Setting the property value to @c null or an empty string is equivalent
+        to deleting the existing value. A default value (if it is defined for
+        this property) will be used by the format backend in this case.
       </desc>
       <param name="names" type="wstring" safearray="yes" dir="in">
@@ -11845 +11842 @@
   <enum
     name="NetworkAttachmentType"
-    uuid="44bce1ee-99f7-4e8e-89fc-80597fd9eeaf"
+    uuid="2ac4bc71-6b82-417a-acd1-f7426d2570d6"
     >
     <desc>
@@ -11858 +11855 @@
     <const name="Internal"              value="3"/>
     <const name="HostOnly"              value="4"/>
-    <const name="VDE"                   value="5"/>
+    <const name="Generic"               value="5"/>
   </enum>
 
@@ -11919 +11916 @@
   <interface
     name="INetworkAdapter" extends="$unknown"
-    uuid="6aa240a1-dd58-478e-92e8-aac001ce5547"
+    uuid="b22f71f6-082e-4a1d-aaf2-3ce40e275dd9"
     wsmap="managed"
     >
@@ -11966 +11963 @@
     </attribute>
 
-    <attribute name="attachmentType" type="NetworkAttachmentType" readonly="yes"/>
-
-    <attribute name="hostInterface" type="wstring">
-      <desc>
-        Name of the host network interface the VM is attached to.
+    <attribute name="attachmentType" type="NetworkAttachmentType">
+      <desc>
+        Sets/Gets network attachment type of this network adapter.
+      </desc>
+    </attribute>
+
+    <attribute name="bridgedInterface" type="wstring">
+      <desc>
+        Name of the network interface the VM should be bridged to.
+      </desc>
+    </attribute>
+
+    <attribute name="hostOnlyInterface" type="wstring">
+      <desc>
+        Name of the host only network interface the VM is attached to.
       </desc>
     </attribute>
@@ -11986 +11993 @@
     </attribute>
 
-    <attribute name="VDENetwork" type="wstring">
-      <desc>
-        Name of the VDE switch the VM is attached to.
+    <attribute name="genericDriver" type="wstring">
+      <desc>
+        Name of the driver to use for the "Generic" network attachment type.
       </desc>
     </attribute>
@@ -12030 +12037 @@
         Points to the NAT engine which handles the network address translation
         for this interface. This is active only when the interface actually uses
-        NAT (see <link to="#attachToNAT" />).
+        NAT.
       </desc>
     </attribute>
@@ -12045 +12052 @@
     </attribute>
 
-    <method name="attachToNAT">
-      <desc>
-        Attach the network adapter to the Network Address Translation (NAT) interface.
-      </desc>
-    </method>
-
-    <method name="attachToBridgedInterface">
-      <desc>
-        Attach the network adapter to a bridged host interface.
-      </desc>
-    </method>
-
-    <method name="attachToInternalNetwork">
-      <desc>
-        Attach the network adapter to an internal network.
-      </desc>
-    </method>
-
-    <method name="attachToHostOnlyInterface">
-      <desc>
-        Attach the network adapter to the host-only network.
-      </desc>
-    </method>
-
-    <method name="attachToVDE">
-      <desc>
-        Attach the network adapter to a VDE network.
-      </desc>
-    </method>
-
-    <method name="detach">
-      <desc>
-        Detach the network adapter
-      </desc>
-    </method>
+    <!-- property methods -->
+
+    <method name="getProperty">
+      <desc>
+        Returns the value of the network attachment property with the given name.
+
+        If the requested data @a key does not exist, this function will
+        succeed and return an empty string in the @a value argument.
+
+        <result name="E_INVALIDARG">@a name is @c null or empty.</result>
+      </desc>
+      <param name="key" type="wstring" dir="in">
+        <desc>Name of the property to get.</desc>
+      </param>
+      <param name="value" type="wstring" dir="return">
+        <desc>Current property value.</desc>
+      </param>
+    </method>
+
+    <method name="setProperty">
+      <desc>
+        Sets the value of the network attachment property with the given name.
+
+        Setting the property value to @c null or an empty string is equivalent
+        to deleting the existing value.
+
+        <result name="E_INVALIDARG">@a name is @c null or empty.</result>
+      </desc>
+      <param name="key" type="wstring" dir="in">
+        <desc>Name of the property to set.</desc>
+      </param>
+      <param name="value" type="wstring" dir="in">
+        <desc>Property value to set.</desc>
+      </param>
+    </method>
+
+    <method name="getProperties">
+      <desc>
+        Returns values for a group of properties in one call.
+
+        The names of the properties to get are specified using the @a names
+        argument which is a list of comma-separated property names or
+        an empty string if all properties are to be returned.
+        <note>Currently the value of this argument is ignored and the method
+        always returns all existing properties.</note>
+
+        The method returns two arrays, the array of property names corresponding
+        to the @a names argument and the current values of these properties.
+        Both arrays have the same number of elements with each element at the
+        given index in the first array corresponds to an element at the same
+        index in the second array.
+      </desc>
+      <param name="names" type="wstring" dir="in">
+        <desc>
+          Names of properties to get.
+        </desc>
+      </param>
+      <param name="returnNames" type="wstring" safearray="yes" dir="out">
+        <desc>Names of returned properties.</desc>
+      </param>
+      <param name="returnValues" type="wstring" safearray="yes" dir="return">
+        <desc>Values of returned properties.</desc>
+      </param>
+    </method>
+
   </interface>
 
@@ -12246 +12283 @@
       <desc>
         Host parallel device name. If this parallel port is enabled, setting a
-        @c null or an empty string as this attribute's value will result into
+        @c null or an empty string as this attribute's value will result in
         an error.
       </desc>

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -47 +47 @@
                  mPromiscModePolicy(NetworkAdapterPromiscModePolicy_Deny),
                  mTraceEnabled(FALSE),
-                 mHostInterface("") /* cannot be null */,
-#ifdef VBOX_WITH_VDE
-                 mVDENetwork("") /* can be null */,
-#endif
+                 mBridgedInterface("") /* cannot be null */,
+                 mHostOnlyInterface("") /* cannot be null */,
                  mNATNetwork("") /* cannot be null */,
                  mBootPriority(0)
@@ -65 +63 @@
         BOOL mTraceEnabled;
         Bstr mTraceFile;
-        Bstr mHostInterface;
+        Bstr mBridgedInterface;
+        Bstr mHostOnlyInterface;
         Bstr mInternalNetwork;
-#ifdef VBOX_WITH_VDE
-        Bstr mVDENetwork;
-#endif
         Bstr mNATNetwork;
+        Bstr mGenericDriver;
+        settings::StringsMap mGenericProperties;
         ULONG mBootPriority;
         ComObjPtr<BandwidthGroup> mBandwidthGroup;
@@ -82 +80 @@
 
     BEGIN_COM_MAP(NetworkAdapter)
-        VBOX_DEFAULT_INTERFACE_ENTRIES (INetworkAdapter)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(INetworkAdapter)
     END_COM_MAP()
 
-    DECLARE_EMPTY_CTOR_DTOR (NetworkAdapter)
+    DECLARE_EMPTY_CTOR_DTOR(NetworkAdapter)
 
     HRESULT FinalConstruct();
@@ -91 +89 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (Machine *aParent, ULONG aSlot);
-    HRESULT init (Machine *aParent, NetworkAdapter *aThat);
-    HRESULT initCopy (Machine *aParent, NetworkAdapter *aThat);
+    HRESULT init(Machine *aParent, ULONG aSlot);
+    HRESULT init(Machine *aParent, NetworkAdapter *aThat);
+    HRESULT initCopy(Machine *aParent, NetworkAdapter *aThat);
     void uninit();
 
@@ -99 +97 @@
     STDMETHOD(COMGETTER(AdapterType))(NetworkAdapterType_T *aAdapterType);
     STDMETHOD(COMSETTER(AdapterType))(NetworkAdapterType_T aAdapterType);
-    STDMETHOD(COMGETTER(Slot)) (ULONG *aSlot);
-    STDMETHOD(COMGETTER(Enabled)) (BOOL *aEnabled);
-    STDMETHOD(COMSETTER(Enabled)) (BOOL aEnabled);
-    STDMETHOD(COMGETTER(MACAddress)) (BSTR *aMACAddress);
-    STDMETHOD(COMSETTER(MACAddress)) (IN_BSTR aMACAddress);
-    STDMETHOD(COMGETTER(AttachmentType)) (NetworkAttachmentType_T *aAttachmentType);
-    STDMETHOD(COMGETTER(HostInterface)) (BSTR *aHostInterface);
-    STDMETHOD(COMSETTER(HostInterface)) (IN_BSTR aHostInterface);
-    STDMETHOD(COMGETTER(InternalNetwork)) (BSTR *aInternalNetwork);
-    STDMETHOD(COMSETTER(InternalNetwork)) (IN_BSTR aInternalNetwork);
-    STDMETHOD(COMGETTER(NATNetwork)) (BSTR *aNATNetwork);
-    STDMETHOD(COMSETTER(NATNetwork)) (IN_BSTR aNATNetwork);
-    STDMETHOD(COMGETTER(VDENetwork)) (BSTR *aVDENetwork);
-    STDMETHOD(COMSETTER(VDENetwork)) (IN_BSTR aVDENetwork);
-    STDMETHOD(COMGETTER(CableConnected)) (BOOL *aConnected);
-    STDMETHOD(COMSETTER(CableConnected)) (BOOL aConnected);
-    STDMETHOD(COMGETTER(TraceEnabled)) (BOOL *aEnabled);
-    STDMETHOD(COMSETTER(TraceEnabled)) (BOOL aEnabled);
-    STDMETHOD(COMGETTER(LineSpeed)) (ULONG *aSpeed);
-    STDMETHOD(COMSETTER(LineSpeed)) (ULONG aSpeed);
+    STDMETHOD(COMGETTER(Slot))(ULONG *aSlot);
+    STDMETHOD(COMGETTER(Enabled))(BOOL *aEnabled);
+    STDMETHOD(COMSETTER(Enabled))(BOOL aEnabled);
+    STDMETHOD(COMGETTER(MACAddress))(BSTR *aMACAddress);
+    STDMETHOD(COMSETTER(MACAddress))(IN_BSTR aMACAddress);
+    STDMETHOD(COMGETTER(AttachmentType))(NetworkAttachmentType_T *aAttachmentType);
+    STDMETHOD(COMSETTER(AttachmentType))(NetworkAttachmentType_T aAttachmentType);
+    STDMETHOD(COMGETTER(BridgedInterface))(BSTR *aBridgedInterface);
+    STDMETHOD(COMSETTER(BridgedInterface))(IN_BSTR aBridgedInterface);
+    STDMETHOD(COMGETTER(HostOnlyInterface))(BSTR *aHostOnlyInterface);
+    STDMETHOD(COMSETTER(HostOnlyInterface))(IN_BSTR aHostOnlyInterface);
+    STDMETHOD(COMGETTER(InternalNetwork))(BSTR *aInternalNetwork);
+    STDMETHOD(COMSETTER(InternalNetwork))(IN_BSTR aInternalNetwork);
+    STDMETHOD(COMGETTER(NATNetwork))(BSTR *aNATNetwork);
+    STDMETHOD(COMSETTER(NATNetwork))(IN_BSTR aNATNetwork);
+    STDMETHOD(COMGETTER(GenericDriver))(BSTR *aGenericDriver);
+    STDMETHOD(COMSETTER(GenericDriver))(IN_BSTR aGenericDriver);
+    STDMETHOD(COMGETTER(CableConnected))(BOOL *aConnected);
+    STDMETHOD(COMSETTER(CableConnected))(BOOL aConnected);
+    STDMETHOD(COMGETTER(TraceEnabled))(BOOL *aEnabled);
+    STDMETHOD(COMSETTER(TraceEnabled))(BOOL aEnabled);
+    STDMETHOD(COMGETTER(LineSpeed))(ULONG *aSpeed);
+    STDMETHOD(COMSETTER(LineSpeed))(ULONG aSpeed);
     STDMETHOD(COMGETTER(PromiscModePolicy))(NetworkAdapterPromiscModePolicy_T *aPromiscModePolicy);
     STDMETHOD(COMSETTER(PromiscModePolicy))(NetworkAdapterPromiscModePolicy_T aPromiscModePolicy);
-    STDMETHOD(COMGETTER(TraceFile)) (BSTR *aTraceFile);
-    STDMETHOD(COMSETTER(TraceFile)) (IN_BSTR aTraceFile);
-    STDMETHOD(COMGETTER(NatDriver)) (INATEngine **aNatDriver);
-    STDMETHOD(COMGETTER(BootPriority)) (ULONG *aBootPriority);
-    STDMETHOD(COMSETTER(BootPriority)) (ULONG aBootPriority);
-    STDMETHOD(COMGETTER(BandwidthGroup)) (IBandwidthGroup **aBwGroup);
-    STDMETHOD(COMSETTER(BandwidthGroup)) (IBandwidthGroup *aBwGroup);
+    STDMETHOD(COMGETTER(TraceFile))(BSTR *aTraceFile);
+    STDMETHOD(COMSETTER(TraceFile))(IN_BSTR aTraceFile);
+    STDMETHOD(COMGETTER(NatDriver))(INATEngine **aNatDriver);
+    STDMETHOD(COMGETTER(BootPriority))(ULONG *aBootPriority);
+    STDMETHOD(COMSETTER(BootPriority))(ULONG aBootPriority);
+    STDMETHOD(COMGETTER(BandwidthGroup))(IBandwidthGroup **aBwGroup);
+    STDMETHOD(COMSETTER(BandwidthGroup))(IBandwidthGroup *aBwGroup);
 
     // INetworkAdapter methods
-    STDMETHOD(AttachToNAT)();
-    STDMETHOD(AttachToBridgedInterface)();
-    STDMETHOD(AttachToInternalNetwork)();
-    STDMETHOD(AttachToHostOnlyInterface)();
-    STDMETHOD(AttachToVDE)();
-    STDMETHOD(Detach)();
+    STDMETHOD(GetProperty)(IN_BSTR aName, BSTR *aValue);
+    STDMETHOD(SetProperty)(IN_BSTR aName, IN_BSTR aValue);
+    STDMETHOD(GetProperties)(IN_BSTR aNames,
+                             ComSafeArrayOut(BSTR, aReturnNames),
+                             ComSafeArrayOut(BSTR, aReturnValues));
 
     // public methods only for internal purposes
@@ -145 +145 @@
     void rollback();
     void commit();
-    void copyFrom (NetworkAdapter *aThat);
-    void applyDefaults (GuestOSType *aOsType);
+    void copyFrom(NetworkAdapter *aThat);
+    void applyDefaults(GuestOSType *aOsType);
 
 private:
 
-    void detach();
     void generateMACAddress();
     HRESULT updateMacAddress(Utf8Str aMacAddress);

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -3335 +3335 @@
                 SafeArray<BSTR> names;
                 SafeArray<BSTR> values;
-                hrc = pMedium->GetProperties(NULL,
-                                            ComSafeArrayAsOutParam(names),
-                                            ComSafeArrayAsOutParam(values));               H();
+                hrc = pMedium->GetProperties((CBSTR)L"",
+                                             ComSafeArrayAsOutParam(names),
+                                             ComSafeArrayAsOutParam(values));               H();
 
                 if (names.size() != 0)
@@ -3504 +3504 @@
         }
 
+        Utf8Str strNetDriver;
         if (fAttachDetach && fSniffer)
         {
@@ -3513 +3514 @@
                 pszNetDriver = "HostInterface";
 #endif
+            if (meAttachmentType[uInstance] == NetworkAttachmentType_Generic)
+            {
+                hrc = aNetworkAdapter->COMGETTER(GenericDriver)(bstr.asOutParam()); H();
+                strNetDriver = bstr;
+                pszNetDriver = strNetDriver.c_str();
+            }
 
             rc = PDMR3DriverDetach(pVM, pszDevice, uInstance, uLun, pszNetDriver, 0, 0 /*fFlags*/);
@@ -3763 +3770 @@
                 }
 
-                Bstr HifName;
-                hrc = aNetworkAdapter->COMGETTER(HostInterface)(HifName.asOutParam());
+                Bstr BridgedIfName;
+                hrc = aNetworkAdapter->COMGETTER(BridgedInterface)(BridgedIfName.asOutParam());
                 if (FAILED(hrc))
                 {
-                    LogRel(("NetworkAttachmentType_Bridged: COMGETTER(HostInterface) failed, hrc (0x%x)", hrc));
+                    LogRel(("NetworkAttachmentType_Bridged: COMGETTER(BridgedInterface) failed, hrc (0x%x)", hrc));
                     H();
                 }
 
-                Utf8Str HifNameUtf8(HifName);
-                const char *pszHifName = HifNameUtf8.c_str();
+                Utf8Str BridgedIfNameUtf8(BridgedIfName);
+                const char *pszBridgedIfName = BridgedIfNameUtf8.c_str();
 
 # if defined(RT_OS_DARWIN)
                 /* The name is on the form 'ifX: long name', chop it off at the colon. */
                 char szTrunk[8];
-                RTStrCopy(szTrunk, sizeof(szTrunk), pszHifName);
+                RTStrCopy(szTrunk, sizeof(szTrunk), pszBridgedIfName);
                 char *pszColon = (char *)memchr(szTrunk, ':', sizeof(szTrunk));
 // Quick fix for #5633
@@ -3791 +3798 @@
 //                     return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
 //                                       N_("Malformed host interface networking name '%ls'"),
-//                                       HifName.raw());
+//                                       BridgedIfName.raw());
 //                 }
                 if (pszColon)
@@ -3800 +3807 @@
                 /* The name is on the form format 'ifX[:1] - long name, chop it off at space. */
                 char szTrunk[256];
-                strlcpy(szTrunk, pszHifName, sizeof(szTrunk));
+                strlcpy(szTrunk, pszBridgedIfName, sizeof(szTrunk));
                 char *pszSpace = (char *)memchr(szTrunk, ' ', sizeof(szTrunk));
 
@@ -3820 +3827 @@
 # elif defined(RT_OS_WINDOWS)
                 ComPtr<IHostNetworkInterface> hostInterface;
-                hrc = host->FindHostNetworkInterfaceByName(HifName.raw(),
+                hrc = host->FindHostNetworkInterfaceByName(BridgedIfName.raw(),
                                                            hostInterface.asOutParam());
                 if (!SUCCEEDED(hrc))
@@ -3827 +3834 @@
                     return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
                                       N_("Nonexistent host networking interface, name '%ls'"),
-                                      HifName.raw());
+                                      BridgedIfName.raw());
                 }
 
@@ -3842 +3849 @@
                     return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
                                       N_("Interface ('%ls') is not a Bridged Adapter interface"),
-                                      HifName.raw());
+                                      BridgedIfName.raw());
                 }
 
@@ -3930 +3937 @@
                  * interface via the current FreeBSD vboxnetflt implementation.
                  */
-                if (!strncmp(pszHifName, "tap", sizeof "tap" - 1)) {
+                if (!strncmp(pszBridgedIfName, "tap", sizeof "tap" - 1)) {
                     hrc = attachToTapInterface(aNetworkAdapter);
                     if (FAILED(hrc))
@@ -3942 +3949 @@
                                                 "sysctl is set.  Either run 'chmod 0666 /dev/%s' or "
                                                 "change the group of that node to vboxusers and make yourself "
-                                                "a member of that group.  Make sure that these changes are permanent."), pszHifName, pszHifName);
+                                                "a member of that group.  Make sure that these changes are permanent."), pszBridgedIfName, pszBridgedIfName);
                             default:
                                 AssertMsgFailed(("Could not attach to tap interface! Bad!\n"));
@@ -3961 +3968 @@
 #  endif
                 /** @todo Check for malformed names. */
-                const char *pszTrunk = pszHifName;
+                const char *pszTrunk = pszBridgedIfName;
 
                 /* Issue a warning if the interface is down */
@@ -3970 +3977 @@
                         struct ifreq Req;
                         RT_ZERO(Req);
-                        strncpy(Req.ifr_name, pszHifName, sizeof(Req.ifr_name) - 1);
+                        strncpy(Req.ifr_name, pszBridgedIfName, sizeof(Req.ifr_name) - 1);
                         if (ioctl(iSock, SIOCGIFFLAGS, &Req) >= 0)
                             if ((Req.ifr_flags & IFF_UP) == 0)
                                 setVMRuntimeErrorCallbackF(pVM, this, 0, "BridgedInterfaceDown",
                                                            "Bridged interface %s is down. Guest will not be able to use this interface",
-                                                           pszHifName);
+                                                           pszBridgedIfName);
 
                         close(iSock);
@@ -3992 +3999 @@
                 InsertConfigString(pCfg, "IfPolicyPromisc", pszPromiscuousGuestPolicy);
                 char szNetwork[INTNET_MAX_NETWORK_NAME];
-                RTStrPrintf(szNetwork, sizeof(szNetwork), "HostInterfaceNetworking-%s", pszHifName);
+                RTStrPrintf(szNetwork, sizeof(szNetwork), "HostInterfaceNetworking-%s", pszBridgedIfName);
                 InsertConfigString(pCfg, "Network", szNetwork);
                 networkName = Bstr(szNetwork);
@@ -4000 +4007 @@
 # if defined(RT_OS_DARWIN)
                 /** @todo Come up with a better deal here. Problem is that IHostNetworkInterface is completely useless here. */
-                if (    strstr(pszHifName, "Wireless")
-                    ||  strstr(pszHifName, "AirPort" ))
+                if (    strstr(pszBridgedIfName, "Wireless")
+                    ||  strstr(pszBridgedIfName, "AirPort" ))
                     InsertConfigInteger(pCfg, "SharedMacOnWire", true);
 # elif defined(RT_OS_LINUX)
@@ -4010 +4017 @@
 
                     memset(&WRq, 0, sizeof(WRq));
-                    strncpy(WRq.ifr_name, pszHifName, IFNAMSIZ);
+                    strncpy(WRq.ifr_name, pszBridgedIfName, IFNAMSIZ);
                     bool fSharedMacOnWire = ioctl(iSock, SIOCGIWNAME, &WRq) >= 0;
                     close(iSock);
@@ -4031 +4038 @@
 
                     memset(&WReq, 0, sizeof(WReq));
-                    strncpy(WReq.i_name, pszHifName, sizeof(WReq.i_name));
+                    strncpy(WReq.i_name, pszBridgedIfName, sizeof(WReq.i_name));
                     WReq.i_type = IEEE80211_IOC_SSID;
                     WReq.i_val = -1;
@@ -4179 +4186 @@
                 InsertConfigNode(pLunL0, "Config", &pCfg);
 
-                Bstr HifName;
-                hrc = aNetworkAdapter->COMGETTER(HostInterface)(HifName.asOutParam());
+                Bstr HostOnlyName;
+                hrc = aNetworkAdapter->COMGETTER(HostOnlyInterface)(HostOnlyName.asOutParam());
                 if (FAILED(hrc))
                 {
-                    LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(HostInterface) failed, hrc (0x%x)\n", hrc));
+                    LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(HostOnlyInterface) failed, hrc (0x%x)\n", hrc));
                     H();
                 }
 
-                Utf8Str HifNameUtf8(HifName);
-                const char *pszHifName = HifNameUtf8.c_str();
+                Utf8Str HostOnlyNameUtf8(HostOnlyName);
+                const char *pszHostOnlyName = HostOnlyNameUtf8.c_str();
                 ComPtr<IHostNetworkInterface> hostInterface;
-                rc = host->FindHostNetworkInterfaceByName(HifName.raw(),
+                rc = host->FindHostNetworkInterfaceByName(HostOnlyName.raw(),
                                                           hostInterface.asOutParam());
                 if (!SUCCEEDED(rc))
@@ -4197 +4204 @@
                     return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
                                       N_("Nonexistent host networking interface, name '%ls'"),
-                                      HifName.raw());
+                                      HostOnlyName.raw());
                 }
 
                 char szNetwork[INTNET_MAX_NETWORK_NAME];
-                RTStrPrintf(szNetwork, sizeof(szNetwork), "HostInterfaceNetworking-%s", pszHifName);
+                RTStrPrintf(szNetwork, sizeof(szNetwork), "HostInterfaceNetworking-%s", pszHostOnlyName);
 
 #if defined(RT_OS_WINDOWS)
@@ -4222 +4229 @@
                     return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
                                       N_("Interface ('%ls') is not a Host-Only Adapter interface"),
-                                      HifName.raw());
+                                      HostOnlyName.raw());
 
                 hrc = hostInterface->COMGETTER(Id)(bstr.asOutParam());
@@ -4313 +4320 @@
 # endif /* defined VBOX_WITH_NETFLT*/
 #elif defined(RT_OS_DARWIN)
-                InsertConfigString(pCfg, "Trunk", pszHifName);
+                InsertConfigString(pCfg, "Trunk", pszHostOnlyName);
                 InsertConfigString(pCfg, "Network", szNetwork);
                 InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp);
                 networkName = Bstr(szNetwork);
-                trunkName   = Bstr(pszHifName);
+                trunkName   = Bstr(pszHostOnlyName);
                 trunkType   = TRUNKTYPE_NETADP;
 #else
-                InsertConfigString(pCfg, "Trunk", pszHifName);
+                InsertConfigString(pCfg, "Trunk", pszHostOnlyName);
                 InsertConfigString(pCfg, "Network", szNetwork);
                 InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt);
                 networkName = Bstr(szNetwork);
-                trunkName   = Bstr(pszHifName);
+                trunkName   = Bstr(pszHostOnlyName);
                 trunkType   = TRUNKTYPE_NETFLT;
 #endif
@@ -4334 +4341 @@
 
                 hrc = virtualBox->GetExtraData(BstrFmt("HostOnly/%s/IPAddress",
-                                                       pszHifName).raw(),
+                                                       pszHostOnlyName).raw(),
                                                tmpAddr.asOutParam());
                 if (SUCCEEDED(hrc) && !tmpAddr.isEmpty())
                 {
                     hrc = virtualBox->GetExtraData(BstrFmt("HostOnly/%s/IPNetMask",
-                                                           pszHifName).raw(),
+                                                           pszHostOnlyName).raw(),
                                                    tmpMask.asOutParam());
                     if (SUCCEEDED(hrc) && !tmpMask.isEmpty())
@@ -4351 +4358 @@
                 {
                     /* Grab the IP number from the 'vboxnetX' instance number (see netif.h) */
-                    hrc = hostInterface->EnableStaticIpConfig(getDefaultIPv4Address(Bstr(pszHifName)).raw(),
+                    hrc = hostInterface->EnableStaticIpConfig(getDefaultIPv4Address(Bstr(pszHostOnlyName)).raw(),
                                                               Bstr(VBOXNET_IPV4MASK_DEFAULT).raw());
                 }
@@ -4358 +4365 @@
 
                 hrc = virtualBox->GetExtraData(BstrFmt("HostOnly/%s/IPV6Address",
-                                                       pszHifName).raw(),
+                                                       pszHostOnlyName).raw(),
                                                tmpAddr.asOutParam());
                 if (SUCCEEDED(hrc))
-                    hrc = virtualBox->GetExtraData(BstrFmt("HostOnly/%s/IPV6NetMask", pszHifName).raw(),
+                    hrc = virtualBox->GetExtraData(BstrFmt("HostOnly/%s/IPV6NetMask", pszHostOnlyName).raw(),
                                                    tmpMask.asOutParam());
                 if (SUCCEEDED(hrc) && !tmpAddr.isEmpty() && !tmpMask.isEmpty())
@@ -4373 +4380 @@
             }
 
-#if defined(VBOX_WITH_VDE)
-            case NetworkAttachmentType_VDE:
-            {
-                hrc = aNetworkAdapter->COMGETTER(VDENetwork)(bstr.asOutParam());            H();
-                InsertConfigNode(pInst, "LUN#0", &pLunL0);
-                InsertConfigString(pLunL0, "Driver", "VDE");
+            case NetworkAttachmentType_Generic:
+            {
+                hrc = aNetworkAdapter->COMGETTER(GenericDriver)(bstr.asOutParam());         H();
+                SafeArray<BSTR> names;
+                SafeArray<BSTR> values;
+                hrc = aNetworkAdapter->GetProperties((CBSTR)L"",
+                                                     ComSafeArrayAsOutParam(names),
+                                                     ComSafeArrayAsOutParam(values));       H();
+
+                if (fSniffer)
+                    InsertConfigNode(pLunL0, "AttachedDriver", &pLunL0);
+                else
+                    InsertConfigNode(pInst, "LUN#0", &pLunL0);
+                InsertConfigString(pLunL0, "Driver", bstr);
                 InsertConfigNode(pLunL0, "Config", &pCfg);
-                if (!bstr.isEmpty())
-                {
-                    InsertConfigString(pCfg, "Network", bstr);
-                    networkName = bstr;
+                for (size_t ii = 0; ii < names.size(); ++ii)
+                {
+                    if (values[ii] && *values[ii])
+                    {
+                        Utf8Str name = names[ii];
+                        Utf8Str value = values[ii];
+                        InsertConfigString(pCfg, name.c_str(), value);
+                    }
                 }
                 break;
             }
-#endif
 
             default:
@@ -4406 +4424 @@
             case NetworkAttachmentType_HostOnly:
             case NetworkAttachmentType_NAT:
-#if defined(VBOX_WITH_VDE)
-            case NetworkAttachmentType_VDE:
-#endif
+            case NetworkAttachmentType_Generic:
             {
                 if (SUCCEEDED(hrc) && SUCCEEDED(rc))

trunk/src/VBox/Main/src-server/ApplianceImpl.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -267 +267 @@
         case NetworkAttachmentType_Internal: strType = "Internal"; break;
         case NetworkAttachmentType_HostOnly: strType = "HostOnly"; break;
-        case NetworkAttachmentType_VDE: strType = "VDE"; break;
+        case NetworkAttachmentType_Generic: strType = "Generic"; break;
         case NetworkAttachmentType_Null: strType = "Null"; break;
     }

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -405 +405 @@
                          && (strNetwork.compare("Internal", Utf8Str::CaseInsensitive))
                          && (strNetwork.compare("HostOnly", Utf8Str::CaseInsensitive))
-                         && (strNetwork.compare("VDE", Utf8Str::CaseInsensitive))
+                         && (strNetwork.compare("Generic", Utf8Str::CaseInsensitive))
                        )
                         strNetwork = "Bridged";     // VMware assumes this is the default apparently
@@ -2045 +2045 @@
             {
                 /* Attach to the right interface */
-                rc = pNetworkAdapter->AttachToBridgedInterface();
+                rc = pNetworkAdapter->COMSETTER(AttachmentType)(NetworkAttachmentType_Bridged);
                 if (FAILED(rc)) throw rc;
                 ComPtr<IHost> host;
@@ -2068 +2068 @@
                         if (FAILED(rc)) throw rc;
                         /* Set the interface name to attach to */
-                        pNetworkAdapter->COMSETTER(HostInterface)(name.raw());
+                        pNetworkAdapter->COMSETTER(BridgedInterface)(name.raw());
                         if (FAILED(rc)) throw rc;
                         break;
@@ -2078 +2078 @@
             {
                 /* Attach to the right interface */
-                rc = pNetworkAdapter->AttachToHostOnlyInterface();
+                rc = pNetworkAdapter->COMSETTER(AttachmentType)(NetworkAttachmentType_HostOnly);
                 if (FAILED(rc)) throw rc;
                 ComPtr<IHost> host;
@@ -2101 +2101 @@
                         if (FAILED(rc)) throw rc;
                         /* Set the interface name to attach to */
-                        pNetworkAdapter->COMSETTER(HostInterface)(name.raw());
+                        pNetworkAdapter->COMSETTER(HostOnlyInterface)(name.raw());
                         if (FAILED(rc)) throw rc;
                         break;
@@ -2111 +2111 @@
             {
                 /* Attach to the right interface */
-                rc = pNetworkAdapter->AttachToInternalNetwork();
+                rc = pNetworkAdapter->COMSETTER(AttachmentType)(NetworkAttachmentType_Internal);
                 if (FAILED(rc)) throw rc;
             }
-            /* Next test for VDE interfaces */
-            else if (pvsys->strExtraConfigCurrent.endsWith("type=VDE", Utf8Str::CaseInsensitive))
+            /* Next test for Generic interfaces */
+            else if (pvsys->strExtraConfigCurrent.endsWith("type=Generic", Utf8Str::CaseInsensitive))
             {
                 /* Attach to the right interface */
-                rc = pNetworkAdapter->AttachToVDE();
+                rc = pNetworkAdapter->COMSETTER(AttachmentType)(NetworkAttachmentType_Generic);
                 if (FAILED(rc)) throw rc;
             }

trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp

@@ -436 +436 @@
 }
 
-STDMETHODIMP NetworkAdapter::COMGETTER(HostInterface)(BSTR *aHostInterface)
-{
-    CheckComArgOutPointerValid(aHostInterface);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    mData->mHostInterface.cloneTo(aHostInterface);
-
-    return S_OK;
-}
-
-STDMETHODIMP NetworkAdapter::COMSETTER(HostInterface)(IN_BSTR aHostInterface)
+STDMETHODIMP NetworkAdapter::COMSETTER(AttachmentType)(
+    NetworkAttachmentType_T aAttachmentType)
+{
+    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->mAttachmentType != aAttachmentType)
+    {
+        mData.backup();
+
+        /* there must an internal network name */
+        if (mData->mInternalNetwork.isEmpty())
+        {
+            LogRel(("Internal network name not defined, setting to default \"intnet\"\n"));
+            mData->mInternalNetwork = "intnet";
+        }
+
+        mData->mAttachmentType = aAttachmentType;
+
+        m_fModified = true;
+        // leave the lock before informing callbacks
+        alock.release();
+
+        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);       // mParent is const, no need to lock
+        mParent->setModified(Machine::IsModified_NetworkAdapters);
+        mlock.release();
+
+        /* Adapt the CFGM logic and notify the guest => changeAdapter=TRUE. */
+        mParent->onNetworkAdapterChange(this, TRUE);
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP NetworkAdapter::COMGETTER(BridgedInterface)(BSTR *aBridgedInterface)
+{
+    CheckComArgOutPointerValid(aBridgedInterface);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    mData->mBridgedInterface.cloneTo(aBridgedInterface);
+
+    return S_OK;
+}
+
+STDMETHODIMP NetworkAdapter::COMSETTER(BridgedInterface)(IN_BSTR aBridgedInterface)
 {
     Bstr bstrEmpty("");
-    if (!aHostInterface)
-        aHostInterface = bstrEmpty.raw();
+    if (!aBridgedInterface)
+        aBridgedInterface = bstrEmpty.raw();
 
     AutoCaller autoCaller(this);
@@ -465 +505 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (mData->mHostInterface != aHostInterface)
+    if (mData->mBridgedInterface != aBridgedInterface)
     {
         mData.backup();
-        mData->mHostInterface = aHostInterface;
+        mData->mBridgedInterface = aBridgedInterface;
+
+        m_fModified = true;
+        // leave the lock before informing callbacks
+        alock.release();
+
+        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);       // mParent is const, no need to lock
+        mParent->setModified(Machine::IsModified_NetworkAdapters);
+        mlock.release();
+
+        /* When changing the host adapter, adapt the CFGM logic to make this
+         * change immediately effect and to notify the guest that the network
+         * might have changed, therefore changeAdapter=TRUE. */
+        mParent->onNetworkAdapterChange(this, TRUE);
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP NetworkAdapter::COMGETTER(HostOnlyInterface)(BSTR *aHostOnlyInterface)
+{
+    CheckComArgOutPointerValid(aHostOnlyInterface);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    mData->mHostOnlyInterface.cloneTo(aHostOnlyInterface);
+
+    return S_OK;
+}
+
+STDMETHODIMP NetworkAdapter::COMSETTER(HostOnlyInterface)(IN_BSTR aHostOnlyInterface)
+{
+    Bstr bstrEmpty("");
+    if (!aHostOnlyInterface)
+        aHostOnlyInterface = bstrEmpty.raw();
+
+    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->mHostOnlyInterface != aHostOnlyInterface)
+    {
+        mData.backup();
+        mData->mHostOnlyInterface = aHostOnlyInterface;
 
         m_fModified = true;
@@ -593 +684 @@
 }
 
-STDMETHODIMP NetworkAdapter::COMGETTER(VDENetwork) (BSTR *aVDENetwork)
-{
-#if defined(VBOX_WITH_VDE)
-    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;
-#else
-    NOREF(aVDENetwork);
-    return E_NOTIMPL;
-#endif
-}
-
-STDMETHODIMP NetworkAdapter::COMSETTER(VDENetwork) (IN_BSTR aVDENetwork)
-{
-#if defined(VBOX_WITH_VDE)
+STDMETHODIMP NetworkAdapter::COMGETTER(GenericDriver)(BSTR *aGenericDriver)
+{
+    CheckComArgOutPointerValid(aGenericDriver);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    mData->mGenericDriver.cloneTo(aGenericDriver);
+
+    return S_OK;
+}
+
+STDMETHODIMP NetworkAdapter::COMSETTER(GenericDriver)(IN_BSTR aGenericDriver)
+{
     Bstr bstrEmpty("");
-    if (!aVDENetwork)
-        aVDENetwork = bstrEmpty.raw();
+    if (!aGenericDriver)
+        aGenericDriver = bstrEmpty.raw();
 
     AutoCaller autoCaller(this);
@@ -623 +708 @@
 
     /* 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)
+    AutoMutableStateDependency adep(mParent);
+    if (FAILED(adep.rc())) return adep.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (mData->mGenericDriver != aGenericDriver)
     {
         mData.backup();
-        mData->mVDENetwork = aVDENetwork;
+        mData->mGenericDriver = aGenericDriver;
 
         /* leave the lock before informing callbacks */
         alock.release();
 
-        mParent->onNetworkAdapterChange (this, FALSE);
-    }
-
-    return S_OK;
-#else
-    NOREF(aVDENetwork);
-    return E_NOTIMPL;
-#endif
+        mParent->onNetworkAdapterChange(this, FALSE);
+    }
+
+    return S_OK;
 }
 
@@ -935 +1016 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP NetworkAdapter::AttachToNAT()
-{
-    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->mAttachmentType != NetworkAttachmentType_NAT)
-    {
-        mData.backup();
-
-        // Commented this for now as it resets the parameter mData->mNATNetwork
-        // which is essential while changing the Attachment dynamically.
-        //detach();
-
-        mData->mAttachmentType = NetworkAttachmentType_NAT;
-
-        m_fModified = true;
-        // leave the lock before informing callbacks
-        alock.release();
-
-        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);       // mParent is const, no need to lock
+STDMETHODIMP NetworkAdapter::GetProperty(IN_BSTR aKey, BSTR *aValue)
+{
+    CheckComArgOutPointerValid(aValue);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    Bstr key = aKey;
+    Bstr value;
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    Utf8Str strKey(key);
+    settings::StringsMap::const_iterator it = mData->mGenericProperties.find(strKey);
+    if (it != mData->mGenericProperties.end())
+    {
+        value = it->second; // source is a Utf8Str
+        value.cloneTo(aValue);
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP NetworkAdapter::SetProperty(IN_BSTR aKey, IN_BSTR aValue)
+{
+    LogFlowThisFunc(("\n"));
+
+    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();
+
+    Bstr key = aKey;
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    bool fGenericChange = (mData->mAttachmentType == NetworkAttachmentType_Generic);
+
+    /* Generic properties processing.
+     * Look up the old value first; if nothing's changed then do nothing.
+     */
+    Utf8Str strValue(aValue);
+    Utf8Str strKey(aKey);
+    Utf8Str strOldValue;
+
+    settings::StringsMap::const_iterator it = mData->mGenericProperties.find(strKey);
+    if (it != mData->mGenericProperties.end())
+        strOldValue = it->second;
+
+    if (strOldValue != strValue)
+    {
+        if (strValue.isEmpty())
+            mData->mGenericProperties.erase(strKey);
+        else
+            mData->mGenericProperties[strKey] = strValue;
+
+        /* leave the lock before informing callbacks */
+        alock.release();
+
+        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);
         mParent->setModified(Machine::IsModified_NetworkAdapters);
         mlock.release();
 
-        /* Adapt the CFGM logic and notify the guest => changeAdapter=TRUE. */
-        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 detaching all
-             * attachments.
-             */
-            Detach();
-            return rc;
-        }
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP NetworkAdapter::AttachToBridgedInterface()
-{
-    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_Bridged)
-    {
-        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_Bridged;
-
-        m_fModified = true;
-        // leave the lock before informing callbacks
-        alock.release();
-
-        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);       // mParent is const, no need to lock
-        mParent->setModified(Machine::IsModified_NetworkAdapters);
-        mlock.release();
-
-        /* Adapt the CFGM logic and notify the guest => changeAdapter=TRUE. */
-        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 detaching all attachments.
-             */
-            Detach();
-            return rc;
-        }
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP NetworkAdapter::AttachToInternalNetwork()
-{
-    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 internal network attached */
-    if (mData->mAttachmentType != NetworkAttachmentType_Internal)
-    {
-        mData.backup();
-
-        /* first detach the current attachment */
-        // Commented this for now as it reset the parameter mData->mInternalNetwork
-        // which is essential while changing the Attachment dynamically.
-        //detach();
-
-        /* there must an internal network name */
-        if (mData->mInternalNetwork.isEmpty())
-        {
-            LogRel (("Internal network name not defined, "
-                     "setting to default \"intnet\"\n"));
-            mData->mInternalNetwork = "intnet";
-        }
-
-        mData->mAttachmentType = NetworkAttachmentType_Internal;
-
-        m_fModified = true;
-        // leave the lock before informing callbacks
-        alock.release();
-
-        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);       // mParent is const, no need to lock
-        mParent->setModified(Machine::IsModified_NetworkAdapters);
-        mlock.release();
-
-        /* Adapt the CFGM logic and notify the guest => changeAdapter=TRUE. */
-        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 detaching all
-             * attachments.
-             */
-            Detach();
-            return rc;
-        }
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP NetworkAdapter::AttachToHostOnlyInterface()
-{
-    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_HostOnly)
-    {
-        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_HostOnly;
-
-        m_fModified = true;
-        // leave the lock before informing callbacks
-        alock.release();
-
-        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);       // mParent is const, no need to lock
-        mParent->setModified(Machine::IsModified_NetworkAdapters);
-        mlock.release();
-
-        /* Adapt the CFGM logic and notify the guest => changeAdpater=TRUE. */
-        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 detaching all
-             * attachments.
-             */
-            Detach();
-            return rc;
-        }
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP NetworkAdapter::AttachToVDE()
-{
-#if defined(VBOX_WITH_VDE)
-    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 detaching all
-             * attachments.
-             */
-            Detach();
-            return rc;
-        }
-    }
-
-    return S_OK;
-#else /* !VBOX_WITH_VDE */
-    return E_NOTIMPL;
-#endif
-}
-
-STDMETHODIMP NetworkAdapter::Detach()
-{
-    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->mAttachmentType != NetworkAttachmentType_Null)
-    {
-        mData.backup();
-
-        detach();
-
-        m_fModified = true;
-        // leave the lock before informing callbacks
-        alock.release();
-
-        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);       // mParent is const, no need to lock
-        mParent->setModified(Machine::IsModified_NetworkAdapters);
-        mlock.release();
-
-        /* adapt the CFGM logic and notify the guest => changeAdapter=TRUE. */
-        mParent->onNetworkAdapterChange(this, TRUE);
-    }
-
-    return S_OK;
-}
+        /* Avoid deadlock when the event triggers a call to a method of this
+         * interface. */
+        adep.release();
+
+        mParent->onNetworkAdapterChange(this, fGenericChange);
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP NetworkAdapter::GetProperties(IN_BSTR aNames,
+                                           ComSafeArrayOut(BSTR, aReturnNames),
+                                           ComSafeArrayOut(BSTR, aReturnValues))
+{
+    CheckComArgOutSafeArrayPointerValid(aReturnNames);
+    CheckComArgOutSafeArrayPointerValid(aReturnValues);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /// @todo make use of aNames according to the documentation
+    NOREF(aNames);
+
+    com::SafeArray<BSTR> names(mData->mGenericProperties.size());
+    com::SafeArray<BSTR> values(mData->mGenericProperties.size());
+    size_t i = 0;
+
+    for (settings::StringsMap::const_iterator it = mData->mGenericProperties.begin();
+         it != mData->mGenericProperties.end();
+         ++it)
+    {
+        it->first.cloneTo(&names[i]);
+        it->second.cloneTo(&values[i]);
+        ++i;
+    }
+
+    names.detachTo(ComSafeArrayOutArg(aReturnNames));
+    values.detachTo(ComSafeArrayOutArg(aReturnValues));
+
+    return S_OK;
+}
+
+
 
 // public methods only for internal purposes
@@ -1267 +1184 @@
     }
 
-    // leave the lock before attaching
+    mNATEngine->loadSettings(data.nat);
+    mData->mBridgedInterface = data.strBridgedName;
+    mData->mInternalNetwork = data.strInternalNetworkName;
+    mData->mHostOnlyInterface = data.strHostOnlyName;
+    mData->mGenericDriver = data.strGenericDriver;
+    mData->mGenericProperties = data.genericProperties;
+
+    // leave the lock before setting attachment type
     alock.release();
 
-    switch (data.mode)
-    {
-        case NetworkAttachmentType_NAT:
-            mNATEngine->loadSettings(data.nat);
-            rc = AttachToNAT();
-            if (FAILED(rc)) return rc;
-        break;
-
-        case NetworkAttachmentType_Bridged:
-            rc = COMSETTER(HostInterface)(Bstr(data.strName).raw());
-            if (FAILED(rc)) return rc;
-            rc = AttachToBridgedInterface();
-            if (FAILED(rc)) return rc;
-        break;
-
-        case NetworkAttachmentType_Internal:
-            mData->mInternalNetwork = data.strName;
-            Assert(!mData->mInternalNetwork.isEmpty());
-
-            rc = AttachToInternalNetwork();
-            if (FAILED(rc)) return rc;
-        break;
-
-        case NetworkAttachmentType_HostOnly:
-#if defined(VBOX_WITH_NETFLT)
-            rc = COMSETTER(HostInterface)(Bstr(data.strName).raw());
-            if (FAILED(rc)) return rc;
-#endif
-            rc = AttachToHostOnlyInterface();
-            if (FAILED(rc)) return rc;
-        break;
-
-#if defined(VBOX_WITH_VDE)
-        case NetworkAttachmentType_VDE:
-            mData->mVDENetwork = data.strName;
-            rc = AttachToVDE();
-            if (FAILED(rc)) return rc;
-        break;
-#endif
-
-        case NetworkAttachmentType_Null:
-            rc = Detach();
-            if (FAILED(rc)) return rc;
-        break;
-    }
-    if (data.fHasDisabledNAT)
-        mNATEngine->loadSettings(data.nat);
+    rc = COMSETTER(AttachmentType)(data.mode);
+    if (FAILED(rc)) return rc;
 
     // after loading settings, we are no longer different from the XML on disk
@@ -1360 +1239 @@
     data.type = mData->mAdapterType;
 
-    switch (data.mode = mData->mAttachmentType)
-    {
-        case NetworkAttachmentType_Null:
-            data.strName.setNull();
-        break;
-
-        case NetworkAttachmentType_NAT:
-            data.fHasDisabledNAT = 0;
-            mNATEngine->commit();
-            mNATEngine->saveSettings(data.nat);
-        break;
-
-        case NetworkAttachmentType_Bridged:
-            data.strName = mData->mHostInterface;
-        break;
-
-        case NetworkAttachmentType_Internal:
-            data.strName = mData->mInternalNetwork;
-        break;
-
-        case NetworkAttachmentType_HostOnly:
-            data.strName = mData->mHostInterface;
-        break;
-
-#if defined(VBOX_WITH_VDE)
-        case NetworkAttachmentType_VDE:
-            data.strName = mData->mVDENetwork;
-        break;
-#endif
-    }
-
-    if (data.mode != NetworkAttachmentType_NAT)
-    {
-        data.fHasDisabledNAT = 1; /* ??? */
-        mNATEngine->commit();
-        mNATEngine->saveSettings(data.nat);
-    }
+    data.mode = mData->mAttachmentType;
+
+    mNATEngine->commit();
+    mNATEngine->saveSettings(data.nat);
+
+    data.strBridgedName = mData->mBridgedInterface;
+
+    data.strHostOnlyName = mData->mHostOnlyInterface;
+
+    data.strInternalNetworkName = mData->mInternalNetwork;
+
+    data.strGenericDriver = mData->mGenericDriver;
+    data.genericProperties = mData->mGenericProperties;
 
     // after saving settings, we are no longer different from the XML on disk
@@ -1520 +1375 @@
 // private methods
 ////////////////////////////////////////////////////////////////////////////////
-
-/**
- *  Worker routine for detach handling. No locking, no notifications.
-
- *  @note Must be called from under the object's write lock.
- */
-void NetworkAdapter::detach()
-{
-    AssertReturnVoid (isWriteLockOnCurrentThread());
-
-    switch (mData->mAttachmentType)
-    {
-        case NetworkAttachmentType_Null:
-        {
-            /* nothing to do here */
-            break;
-        }
-        case NetworkAttachmentType_NAT:
-        {
-            break;
-        }
-        case NetworkAttachmentType_Bridged:
-        {
-            /* reset handle and device name */
-            mData->mHostInterface = "";
-            break;
-        }
-        case NetworkAttachmentType_Internal:
-        {
-            mData->mInternalNetwork.setNull();
-            break;
-        }
-        case NetworkAttachmentType_HostOnly:
-        {
-#if defined(VBOX_WITH_NETFLT)
-            /* reset handle and device name */
-            mData->mHostInterface = "";
-#endif
-            break;
-        }
-    }
-
-    mData->mAttachmentType = NetworkAttachmentType_Null;
-}
 
 /**

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

@@ -1480 +1480 @@
                   && (mode                  == n.mode)
                   && (nat                   == n.nat)
-                  && (strName               == n.strName)
+                  && (strBridgedName        == n.strBridgedName)
+                  && (strHostOnlyName       == n.strHostOnlyName)
+                  && (strInternalNetworkName == n.strInternalNetworkName)
+                  && (strGenericDriver      == n.strGenericDriver)
+                  && (genericProperties     == n.genericProperties)
                   && (ulBootPriority        == n.ulBootPriority)
-                  && (fHasDisabledNAT       == n.fHasDisabledNAT)
                 )
            );
@@ -1997 +2000 @@
 void MachineConfigFile::readAttachedNetworkMode(const xml::ElementNode &elmMode, bool fEnabled, NetworkAdapter &nic)
 {
+    NetworkAttachmentType_T enmAttachmentType = NetworkAttachmentType_Null;
+
     if (elmMode.nameEquals("NAT"))
     {
-        if (fEnabled)
-            nic.mode = NetworkAttachmentType_NAT;
-
-        nic.fHasDisabledNAT = (nic.mode != NetworkAttachmentType_NAT && !fEnabled);
-        elmMode.getAttributeValue("network", nic.nat.strNetwork);    // optional network name
+        enmAttachmentType = NetworkAttachmentType_NAT;
+
         elmMode.getAttributeValue("hostip", nic.nat.strBindIP);
         elmMode.getAttributeValue("mtu", nic.nat.u32Mtu);
@@ -2048 +2050 @@
         }
     }
-    else if (   fEnabled
-             && (   (elmMode.nameEquals("HostInterface"))
-                 || (elmMode.nameEquals("BridgedInterface")))
-            )
-    {
-        nic.mode = NetworkAttachmentType_Bridged;
-        elmMode.getAttributeValue("name", nic.strName);    // optional host interface name
-    }
-    else if (   fEnabled
-             && elmMode.nameEquals("InternalNetwork"))
-    {
-        nic.mode = NetworkAttachmentType_Internal;
-        if (!elmMode.getAttributeValue("name", nic.strName))    // required network name
+    else if (   (elmMode.nameEquals("HostInterface"))
+             || (elmMode.nameEquals("BridgedInterface")))
+    {
+        enmAttachmentType = NetworkAttachmentType_Bridged;
+
+        elmMode.getAttributeValue("name", nic.strBridgedName);  // optional bridged interface name
+    }
+    else if (elmMode.nameEquals("InternalNetwork"))
+    {
+        enmAttachmentType = NetworkAttachmentType_Internal;
+
+        if (!elmMode.getAttributeValue("name", nic.strInternalNetworkName))    // required network name
             throw ConfigFileError(this, &elmMode, N_("Required InternalNetwork/@name element is missing"));
     }
-    else if (   fEnabled
-             && elmMode.nameEquals("HostOnlyInterface"))
-    {
-        nic.mode = NetworkAttachmentType_HostOnly;
-        if (!elmMode.getAttributeValue("name", nic.strName))    // required network name
+    else if (elmMode.nameEquals("HostOnlyInterface"))
+    {
+        enmAttachmentType = NetworkAttachmentType_HostOnly;
+
+        if (!elmMode.getAttributeValue("name", nic.strHostOnlyName))    // required network name
             throw ConfigFileError(this, &elmMode, N_("Required HostOnlyInterface/@name element is missing"));
     }
-#if defined(VBOX_WITH_VDE)
-    else if (   fEnabled
-             && elmMode.nameEquals("VDE"))
-    {
-        nic.mode = NetworkAttachmentType_VDE;
-        elmMode.getAttributeValue("network", nic.strName);    // optional network name
-    }
-#endif
+    else if (elmMode.nameEquals("GenericInterface"))
+    {
+        enmAttachmentType = NetworkAttachmentType_Generic;
+
+        elmMode.getAttributeValue("driver", nic.strGenericDriver);  // optional network attachment driver
+
+        // get all properties
+        xml::NodesLoop nl(elmMode);
+        const xml::ElementNode *pelmModeChild;
+        while ((pelmModeChild = nl.forAllNodes()))
+        {
+            if (pelmModeChild->nameEquals("Property"))
+            {
+                Utf8Str strPropName, strPropValue;
+                if (    (pelmModeChild->getAttributeValue("name", strPropName))
+                     && (pelmModeChild->getAttributeValue("value", strPropValue))
+                   )
+                    nic.genericProperties[strPropName] = strPropValue;
+                else
+                    throw ConfigFileError(this, pelmModeChild, N_("Required GenericInterface/Property/@name or @value attribute is missing"));
+            }
+        }
+    }
+    else if (elmMode.nameEquals("VDE"))
+    {
+        enmAttachmentType = NetworkAttachmentType_Generic;
+
+        com::Utf8Str strVDEName;
+        elmMode.getAttributeValue("network", strVDEName);   // optional network name
+        nic.strGenericDriver = "VDE";
+        nic.genericProperties["network"] = strVDEName;
+    }
+
+    if (fEnabled && enmAttachmentType != NetworkAttachmentType_Null)
+        nic.mode = enmAttachmentType;
 }
 
@@ -3747 +3775 @@
 
                 case NetworkAttachmentType_Bridged:
-                    pelmAdapter->createChild("BridgedInterface")->setAttribute("name", nic.strName);
+                    pelmAdapter->createChild("BridgedInterface")->setAttribute("name", nic.strBridgedName);
                 break;
 
                 case NetworkAttachmentType_Internal:
-                    pelmAdapter->createChild("InternalNetwork")->setAttribute("name", nic.strName);
+                    pelmAdapter->createChild("InternalNetwork")->setAttribute("name", nic.strInternalNetworkName);
                 break;
 
                 case NetworkAttachmentType_HostOnly:
-                    pelmAdapter->createChild("HostOnlyInterface")->setAttribute("name", nic.strName);
+                    pelmAdapter->createChild("HostOnlyInterface")->setAttribute("name", nic.strHostOnlyName);
                 break;
-
-#if defined(VBOX_WITH_VDE)
-                case NetworkAttachmentType_VDE:
-                    pelmAdapter->createChild("VDE")->setAttribute("network", nic.strName);
-                break;
-#endif
 
                 default: /*case NetworkAttachmentType_Null:*/
@@ -3771 +3793 @@
         {
             /* m->sv >= SettingsVersion_v1_10 */
-            xml::ElementNode *pelmDisabledNode= NULL;
-            if (nic.fHasDisabledNAT)
-                pelmDisabledNode = pelmAdapter->createChild("DisabledModes");
-            if (nic.fHasDisabledNAT)
-                buildNetworkXML(NetworkAttachmentType_NAT, *pelmDisabledNode, nic);
-            buildNetworkXML(nic.mode, *pelmAdapter, nic);
+            xml::ElementNode *pelmDisabledNode = NULL;
+            pelmDisabledNode = pelmAdapter->createChild("DisabledModes");
+            if (nic.mode != NetworkAttachmentType_NAT)
+                buildNetworkXML(NetworkAttachmentType_NAT, *pelmDisabledNode, false, nic);
+            if (nic.mode != NetworkAttachmentType_Bridged)
+                buildNetworkXML(NetworkAttachmentType_Bridged, *pelmDisabledNode, false, nic);
+            if (nic.mode != NetworkAttachmentType_Internal)
+                buildNetworkXML(NetworkAttachmentType_HostOnly, *pelmDisabledNode, false, nic);
+            if (nic.mode != NetworkAttachmentType_HostOnly)
+                buildNetworkXML(NetworkAttachmentType_HostOnly, *pelmDisabledNode, false, nic);
+            if (nic.mode != NetworkAttachmentType_Generic)
+                buildNetworkXML(NetworkAttachmentType_Generic, *pelmDisabledNode, false, nic);
+            buildNetworkXML(nic.mode, *pelmAdapter, true, nic);
         }
     }
@@ -3972 +4001 @@
  * @param mode
  * @param elmParent
- * @param nice
+ * @param fEnabled
+ * @param nic
  */
 void MachineConfigFile::buildNetworkXML(NetworkAttachmentType_T mode,
                                         xml::ElementNode &elmParent,
+                                        bool fEnabled,
                                         const NetworkAdapter &nic)
 {
@@ -4043 +4074 @@
 
         case NetworkAttachmentType_Bridged:
-            elmParent.createChild("BridgedInterface")->setAttribute("name", nic.strName);
+            if (fEnabled || !nic.strBridgedName.isEmpty())
+                elmParent.createChild("BridgedInterface")->setAttribute("name", nic.strBridgedName);
         break;
 
         case NetworkAttachmentType_Internal:
-            elmParent.createChild("InternalNetwork")->setAttribute("name", nic.strName);
+            if (fEnabled || !nic.strInternalNetworkName.isEmpty())
+                elmParent.createChild("InternalNetwork")->setAttribute("name", nic.strInternalNetworkName);
         break;
 
         case NetworkAttachmentType_HostOnly:
-            elmParent.createChild("HostOnlyInterface")->setAttribute("name", nic.strName);
+            if (fEnabled || !nic.strHostOnlyName.isEmpty())
+                elmParent.createChild("HostOnlyInterface")->setAttribute("name", nic.strHostOnlyName);
         break;
 
-#ifdef VBOX_WITH_VDE
-        case NetworkAttachmentType_VDE:
-            elmParent.createChild("VDE")->setAttribute("network", nic.strName);
+        case NetworkAttachmentType_Generic:
+            if (fEnabled || !nic.strGenericDriver.isEmpty() || nic.genericProperties.size())
+            {
+                xml::ElementNode *pelmMode = elmParent.createChild("GenericInterface");
+                pelmMode->setAttribute("driver", nic.strGenericDriver);
+                for (StringsMap::const_iterator it = nic.genericProperties.begin();
+                     it != nic.genericProperties.end();
+                     ++it)
+                {
+                    xml::ElementNode *pelmProp = pelmMode->createChild("Property");
+                    pelmProp->setAttribute("name", it->first);
+                    pelmProp->setAttribute("value", it->second);
+                }
+            }
         break;
-#endif
 
         default: /*case NetworkAttachmentType_Null:*/
@@ -4512 +4556 @@
     if (m->sv < SettingsVersion_v1_12)
     {
-        // VirtualBox 4.1 adds a promiscuous mode policy to the network adapters.
+        // VirtualBox 4.1 adds a promiscuous mode policy to the network
+        // adapters and a generic network driver transport.
         NetworkAdaptersList::const_iterator netit;
         for (netit = hardwareMachine.llNetworkAdapters.begin();
@@ -4518 +4563 @@
              ++netit)
         {
-            if (netit->enmPromiscModePolicy != NetworkAdapterPromiscModePolicy_Deny)
+            if (   netit->enmPromiscModePolicy != NetworkAdapterPromiscModePolicy_Deny
+                || netit->mode == NetworkAttachmentType_Generic
+                || !netit->strGenericDriver.isEmpty()
+                || netit->genericProperties.size()
+               )
             {
                 m->sv = SettingsVersion_v1_12;

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -7 +7 @@
  *  Common definitions
 
-     Copyright (C) 2004-2010 Oracle Corporation
+     Copyright (C) 2004-2011 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
@@ -767 +767 @@
       </xsd:complexType>
     </xsd:element>
+    <xsd:element name="Generic">
+      <xsd:complexType>
+        <xsd:attribute name="driver" type="xsd:string" use="required"/>
+      </xsd:complexType>
+      <xsd:element name="Property" minOccurs="0" maxOccurs="unbounded">
+        <xsd:complexType>
+          <xsd:attribute name="name" type="xsd:token" use="required"/>
+          <xsd:attribute name="value" type="xsd:string" use="required"/>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:element>
+    <!-- The DisabledModes tag is not part of this XSD file right now. -->
   </xsd:choice>
   <xsd:attribute name="type" type="TNetworkAdapterType" default="Am79C970A"/>