Changeset 19681 in vbox

Timestamp:

May 14, 2009 10:02:13 AM (16 years ago)

Author:

vboxsync

Message:

OVF: always use the server variant of the E1000 when we detect a VMWare OVF by the E10000 bug

File:

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

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1539 +1539 @@
                     }
 #ifdef VBOX_WITH_E1000
-                    else if (!ea.strAdapterType.compare("E1000", Utf8Str::CaseInsensitive) ||
-                             !ea.strAdapterType.compare("E10000", Utf8Str::CaseInsensitive)) // VMWare accidentally write this with VirtualCenter 3.5
+                    /* VMWare accidentally write this with VirtualCenter 3.5,
+                       so make sure in this case always to use the VMWare one */
+                    else if (!ea.strAdapterType.compare("E10000", Utf8Str::CaseInsensitive))
+                        nwAdapterVBox = NetworkAdapterType_I82545EM;
+                    else if (!ea.strAdapterType.compare("E1000", Utf8Str::CaseInsensitive))
                     {
                         /* Check if this OVF was written by VirtualBox */