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

Timestamp:

Apr 24, 2009 11:36:51 AM (16 years ago)

Author:

vboxsync

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

46449

Message:

Main-OVF: always use the VBox default network adapter if the OVF is written by VBox

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1531 +1531 @@
                              !ea.strAdapterType.compare("E10000", Utf8Str::CaseInsensitive)) // VMWare accidentally write this with VirtualCenter 3.5
                     {
-                        /* If the default adapter is already one of the three
-                         * E1000 adapters use the default one. If not use the
-                         * I82545EM as fallback. */
-//                         if (!(defaultAdapterVBox == NetworkAdapterType_I82540EM ||
-//                               defaultAdapterVBox == NetworkAdapterType_I82543GC ||
-//                               defaultAdapterVBox == NetworkAdapterType_I82545EM))
-                        // always use this one since it's what VMware uses
-                        nwAdapterVBox = NetworkAdapterType_I82545EM;
+                        /* Check if this OVF was written by VirtualBox */
+                        if (vsysThis.strVirtualSystemType.contains("virtualbox", Utf8Str::CaseInsensitive))
+                        {
+                            /* If the default adapter is already one of the three
+                             * E1000 adapters use the default one. If not use the
+                             * I82545EM as fallback. */
+                            if (!(defaultAdapterVBox == NetworkAdapterType_I82540EM ||
+                                  defaultAdapterVBox == NetworkAdapterType_I82543GC ||
+                                  defaultAdapterVBox == NetworkAdapterType_I82545EM))
+                            nwAdapterVBox = NetworkAdapterType_I82540EM;
+                        }
+                        else
+                            /* Always use this one since it's what VMware uses */
+                            nwAdapterVBox = NetworkAdapterType_I82545EM;
                     }
 #endif /* VBOX_WITH_E1000 */