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

Timestamp:

Oct 25, 2010 9:57:32 AM (14 years ago)

Author:

vboxsync

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

66997

Message:

Removed VBOX_DYNAMIC_NET_ATTACH, we don't need to keep this optional.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManageControlVM.cpp (modified) (2 diffs)
• VBoxManageHelp.cpp (modified) (2 diffs)

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

@@ -71 +71 @@
         $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
         $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
-        $(if $(VBOX_WITH_VRDP), VBOX_WITH_VRDP) \
-        $(if $(VBOX_DYNAMIC_NET_ATTACH), VBOX_DYNAMIC_NET_ATTACH)
+        $(if $(VBOX_WITH_VRDP), VBOX_WITH_VRDP)
 
 ifneq ($(KBUILD_TARGET),win)

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

@@ -295 +295 @@
             }
         }
-#ifdef VBOX_DYNAMIC_NET_ATTACH
         /* here the order in which strncmp is called is important
          * cause nictracefile can be very well compared with
@@ -487 +486 @@
             }
         }
-#endif /* VBOX_DYNAMIC_NET_ATTACH */
 #ifdef VBOX_WITH_VRDP
         else if (   !strcmp(a->argv[1], "vrde")

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

@@ -389 +389 @@
                      "                            injectnmi|\n"
                      "                            setlinkstate<1-N> on|off |\n"
-#ifdef VBOX_DYNAMIC_NET_ATTACH
 #if defined(VBOX_WITH_NETFLT)
                      "                            nic<1-N> null|nat|bridged|intnet|hostonly\n"
@@ -399 +398 @@
                      "                            nictrace<1-N> on|off\n"
                      "                            nictracefile<1-N> <filename>\n"
-#endif /* VBOX_DYNAMIC_NET_ATTACH */
                      "                            guestmemoryballoon <balloonsize in MB>]\n"
                      "                            gueststatisticsinterval <seconds>]\n"