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

Timestamp:

Nov 15, 2007 1:03:25 PM (17 years ago)

Author:

vboxsync

Message:

Added new type of network device 'e1000'. Define VBOX_WITH_E1000 to activate.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (4 diffs)
• MachineImpl.cpp (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• NetworkAdapterImpl.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (1 diff)
• xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -831 +831 @@
      * Network adapters
      */
-    rc = CFGMR3InsertNode(pDevices, "pcnet", &pDev);                                RC_CHECK();
-    //rc = CFGMR3InsertNode(pDevices, "ne2000", &pDev);                               RC_CHECK();
+    PCFGMNODE pDevPCNet = NULL;          /* PCNet-type devices */
+    rc = CFGMR3InsertNode(pDevices, "pcnet", &pDevPCNet);                           RC_CHECK();
+#ifdef VBOX_WITH_E1000
+    PCFGMNODE pDevE1000 = NULL;          /* E1000-type devices */
+    rc = CFGMR3InsertNode(pDevices, "e1000", &pDevE1000);                           RC_CHECK();
+#endif
     for (ULONG ulInstance = 0; ulInstance < SchemaDefs::NetworkAdapterCount; ulInstance++)
     {
@@ -841 +845 @@
         if (!fEnabled)
             continue;
+
+        /*
+        * The virtual hardware type. Create appropriate device first.
+        */
+        NetworkAdapterType_T adapterType;
+        hrc = networkAdapter->COMGETTER(AdapterType)(&adapterType);                 H();
+        switch (adapterType)
+        {
+            case NetworkAdapterType_NetworkAdapterAm79C970A:
+            case NetworkAdapterType_NetworkAdapterAm79C973:
+                pDev = pDevPCNet;
+                break;
+#ifdef VBOX_WITH_E1000
+            case NetworkAdapterType_NetworkAdapter82540EM:
+                pDev = pDevE1000;
+                break;
+#endif
+            default:
+                AssertMsgFailed(("Invalid network adapter type '%d' for slot '%d'",
+                                 adapterType, ulInstance));
+                return VERR_GENERAL_FAILURE;
+        }
 
         char szInstance[4]; Assert(ulInstance <= 999);
@@ -855 +881 @@
 
         /*
-         * The virtual hardware type.
-         */
-        NetworkAdapterType_T adapterType;
-        hrc = networkAdapter->COMGETTER(AdapterType)(&adapterType);                 H();
+        * The virtual hardware type. PCNet supports two types.
+        */
         switch (adapterType)
         {
@@ -867 +891 @@
                 rc = CFGMR3InsertInteger(pCfg, "Am79C973", 1);                      RC_CHECK();
                 break;
-            default:
-                AssertMsgFailed(("Invalid network adapter type '%d' for slot '%d'",
-                                 adapterType, ulInstance));
-                return VERR_GENERAL_FAILURE;
         }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -4690 +4690 @@
             else if (adapterType.compare(Bstr("Am79C973")) == 0)
                 mNetworkAdapters [slot]->COMSETTER(AdapterType)(NetworkAdapterType_NetworkAdapterAm79C973);
+#ifdef VBOX_WITH_E1000
+            else if (adapterType.compare(Bstr("82540EM")) == 0)
+                mNetworkAdapters [slot]->COMSETTER(AdapterType)(NetworkAdapterType_NetworkAdapter82540EM);
+#endif
             else
                 ComAssertBreak (0, rc = E_FAIL);

trunk/src/VBox/Main/Makefile.kmk

@@ -22 +22 @@
 ifndef VBOX_OSE
 SUBDIRS_AFTER += webservice
+DEFS          += VBOX_WITH_E1000
 endif
 

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -201 +201 @@
         case NetworkAdapterType_NetworkAdapterAm79C970A:
         case NetworkAdapterType_NetworkAdapterAm79C973:
+#ifdef VBOX_WITH_E1000
+        case NetworkAdapterType_NetworkAdapter82540EM:
+#endif
             break;
         default:

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

@@ -7371 +7371 @@
     <const name="NetworkAdapterAm79C970A"        value="1"/>
     <const name="NetworkAdapterAm79C973"         value="2"/>
+    <const name="NetworkAdapter82540EM"          value="3"/>
   </enum>
 

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

@@ -171 +171 @@
     <xsd:enumeration value="Am79C970A"/>
     <xsd:enumeration value="Am79C973"/>
+    <xsd:enumeration value="82540EM"/>
   </xsd:restriction>
 </xsd:simpleType>