monitor usb_attach/detach: remove configure option

4 files changed, 0 insertions, 15 deletions

diff --git a/configure b/configure
index b74497b34..2917874f9 100755
--- a/configure
+++ b/configure
@@ -293,7 +293,6 @@ gprof="no"
 debug_tcg="no"
 debug_mon="no"
 debug="no"
-usb_monitor_attach_detach="no"
 strip_opt="yes"
 bigendian="no"
 mingw32="no"
@@ -591,11 +590,8 @@ for opt do
       debug_tcg="yes"
       debug_mon="yes"
       debug="yes"
-      usb_monitor_attach_detach="yes"
       strip_opt="no"
   ;;
-  --enable-usb-mon-detach) usb_monitor_attach_detach="yes"
-  ;;
   --enable-sparse) sparse="yes"
   ;;
   --disable-sparse) sparse="no"
@@ -856,7 +852,6 @@ echo "  --sysconfdir=PATH        install config in PATH/qemu"
 echo "  --enable-debug-tcg       enable TCG debugging"
 echo "  --disable-debug-tcg      disable TCG debugging (default)"
 echo "  --enable-debug           enable common debug build options"
-echo "  --enable-usb-mon-detach  enable usb monitor attach & detach commands"
 echo "  --enable-sparse          enable sparse checker"
 echo "  --disable-sparse         disable sparse checker (default)"
 echo "  --disable-strip          disable stripping binaries"
@@ -2308,7 +2303,6 @@ echo "host big endian   $bigendian"
 echo "target list       $target_list"
 echo "tcg debug enabled $debug_tcg"
 echo "Mon debug enabled $debug_mon"
-echo "usb mon detach    $usb_monitor_attach_detach"
 echo "gprof enabled     $gprof"
 echo "sparse enabled    $sparse"
 echo "strip binaries    $strip_opt"
@@ -2400,9 +2394,6 @@ fi
 if test "$debug" = "yes" ; then
   echo "CONFIG_DEBUG_EXEC=y" >> $config_host_mak
 fi
-if test "$usb_monitor_attach_detach" = yes ; then
-  echo "CONFIG_USB_MONITOR_ATTACH_DETACH=y" >> $config_host_mak
-fi
 if test "$strip_opt" = "yes" ; then
   echo "STRIP=${strip}" >> $config_host_mak
 fi
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 4859a0c6e..0cc9bfa6c 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -516,7 +516,6 @@ hub. @var{devname} has the syntax @code{bus.addr}. Use the monitor
 command @code{info usb} to see the devices you can remove.
 ETEXI
 
-#ifdef CONFIG_USB_MONITOR_ATTACH_DETACH
     {
         .name       = "usb_attach",
         .args_type  = "id:s",
@@ -552,7 +551,6 @@ hub. Use the monitor command @code{info usb} to see the
 devices you can detach. This command is for debugging usage
 only.
 ETEXI
-#endif // CONFIG_USB_MONITOR_ATTACH_DETACH
 
     {
         .name       = "device_add",
diff --git a/sysemu.h b/sysemu.h
index 2e1df04eb..1dc0e58ee 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -182,10 +182,8 @@ extern struct soundhw soundhw[];
 
 void do_usb_add(Monitor *mon, const QDict *qdict);
 void do_usb_del(Monitor *mon, const QDict *qdict);
-#ifdef CONFIG_USB_MONITOR_ATTACH_DETACH
 void do_usb_attach(Monitor *mon, const QDict *qdict);
 void do_usb_detach(Monitor *mon, const QDict *qdict);
-#endif
 void usb_info(Monitor *mon);
 
 void rtc_change_mon_event(struct tm *tm);
diff --git a/vl.c b/vl.c
index bcd16d679..c4a11639f 100644
--- a/vl.c
+++ b/vl.c
@@ -868,7 +868,6 @@ void do_usb_del(Monitor *mon, const QDict *qdict)
     }
 }
 
-#ifdef CONFIG_USB_MONITOR_ATTACH_DETACH
 void do_usb_attach(Monitor *mon, const QDict *qdict)
 {
     const char *id = qdict_get_str(qdict, "id");
@@ -899,7 +898,6 @@ void do_usb_detach(Monitor *mon, const QDict *qdict)
         error_report("could not detach USB device '%s'", id);
     }
 }
-#endif // CONFIG_USB_MONITOR_ATTACH_DETACH
 
 /***********************************************************/
 /* PCMCIA/Cardbus */