vbox的更動 37200 路徑 trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

時間撮記:

2011-5-24 下午03:34:06 (14 年 以前)

作者:

vboxsync

訊息:

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).

檔案:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (修改) (6 筆差異)

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;
             }