Changeset 6968 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Feb 14, 2008 9:03:24 PM (17 years ago)

Author:

vboxsync

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

28140

Message:

added support for E1000 to VBoxManage

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManage.cpp (modified) (3 diffs)

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

@@ -25 +25 @@
 VBoxManage_DEFS       += $(if $(VBOX_WITH_VRDP),VBOX_VRDP,) \
                          $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
-                         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,)
+                         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
+                         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,)
 VBoxManage_SOURCES     = \
         VBoxManage.cpp \

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

@@ -333 +333 @@
                  "                                     <filename>|host:<drive>]\n"
                  "                            [-nic<1-N> none|null|nat|hostif|intnet]\n"
-                 "                            [-nictype<1-N> Am79C970A|Am79C973]\n"
+                 "                            [-nictype<1-N> Am79C970A|Am79C973"
+#ifdef VBOX_WITH_E1000
+                                                                              "|82540EM"
+#endif
+                 "]\n"
                  "                            [-cableconnected<1-N> on|off]\n"
                  "                            [-nictrace<1-N> on|off]\n"
@@ -1277 +1281 @@
                     strNICType = "Am79C973";
                     break;
+#ifdef VBOX_WITH_E1000
+                case NetworkAdapterType_NetworkAdapter82540EM:
+                    strNICType = "82540EM";
+                    break;
+#endif
                 default:
                     strNICType = "unknown";
@@ -4951 +4960 @@
                     CHECK_ERROR_RET(nic, COMSETTER(AdapterType)(NetworkAdapterType_NetworkAdapterAm79C973), 1);
                 }
+#ifdef VBOX_WITH_E1000
+                else if (strcmp(nictype[n], "82540EM") == 0)
+                {
+                    CHECK_ERROR_RET(nic, COMSETTER(AdapterType)(NetworkAdapterType_NetworkAdapter82540EM), 1);
+                }
+#endif
                 else
                 {