From 755f1ad19e5f6f9404483b71de29db59cd4ebc9a Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Tue, 21 Jul 2009 22:27:09 +0200
Subject: [PATCH 05/16] add option to disable usb mass storage devices

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <0c5556be077d225cfcc2278126c1dea5f9d4647a.1248207931.git.quintela@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Bugzilla: 512837
Obsoletes: <aa59f13707d31f31df10c6e2fc7d01b88e77fd1f.1248095797.git.quintela@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Luiz Capitulino <lcapitulino@redhat.com> (conditional on feature unwanted)
RH-Upstream-status: pending
Acked-by: Dor Laor <dlaor@redhat.com>
---
 qemu/Makefile  |    5 ++++-
 qemu/configure |    9 +++++++++
 qemu/vl.c      |    8 ++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/qemu/Makefile b/qemu/Makefile
index 3659c2e..38b2f58 100644
--- a/qemu/Makefile
+++ b/qemu/Makefile
@@ -83,7 +83,10 @@ OBJS+=cdrom.o
 ifdef CONFIG_SCSI
 OBJS+=scsi-disk.o scsi-generic.o
 endif
-OBJS+=usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
+OBJS+=usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-wacom.o
+ifdef CONFIG_USB_MSD
+OBJS+=usb-msd.o
+endif
 OBJS+=usb-serial.o usb-net.o
 OBJS+=sd.o ssi-sd.o
 OBJS+=bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
diff --git a/qemu/configure b/qemu/configure
index 6bfb477..5764842 100755
--- a/qemu/configure
+++ b/qemu/configure
@@ -177,6 +177,7 @@ bluez="yes"
 smb="yes"
 scsi="yes"
 isapc="yes"
+usb_msd="yes"
 kvm="yes"
 kvm_nested="no"
 kvm_cap_pit="no"
@@ -419,6 +420,8 @@ for opt do
   ;;
   --disable-kvm-nested) kvm_nested="no"
   ;;
+  --disable-usb-msd) usb_msd="no"
+  ;;
   --disable-kvm) kvm="no"
   ;;
   --enable-profiler) profiler="yes"
@@ -574,6 +577,7 @@ echo "  --disable-bluez          disable bluez stack connectivity"
 echo "  --disable-smb            disable smb user directories"
 echo "  --disable-scsi           disable scsi devices"
 echo "  --disable-isapc          disable isapc machine"
+echo "  --disable-usb-msd        disable usb storage devices"
 echo "  --disable-kvm            disable KVM acceleration support"
 echo "  --disable-nptl           disable usermode NPTL support"
 echo "  --enable-system          enable all system emulation targets"
@@ -1307,6 +1311,7 @@ echo "SMB directores    $smb"
 echo "SCSI devices      $scsi"
 echo "ISAPC support     $isapc"
 echo "KVM nested        $kvm_nested"
+echo "USB storage       $usb_msd"
 
 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -1606,6 +1611,10 @@ fi
 if test "$kvm_nested" = "yes" ; then
   echo "#define CONFIG_KVM_NESTED 1" >> $config_h
 fi
+if test "$usb_msd" = "yes" ; then
+  echo "CONFIG_USB_MSD=yes" >> $config_mak
+  echo "#define CONFIG_USB_MSD 1" >> $config_h
+fi
 if test "$aio" = "yes" ; then
   echo "#define CONFIG_AIO 1" >> $config_h
   echo "CONFIG_AIO=yes" >> $config_mak
diff --git a/qemu/vl.c b/qemu/vl.c
index 2e9ac4c..367e877 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -2801,9 +2801,13 @@ static int usb_device_add(const char *devname)
         dev = usb_tablet_init();
     } else if (!strcmp(devname, "keyboard")) {
         dev = usb_keyboard_init();
-    } else if (strstart(devname, "disk:", &p)) {
+    } else
+#ifdef CONFIG_USB_MSD
+    if (strstart(devname, "disk:", &p)) {
         dev = usb_msd_init(p);
-    } else if (!strcmp(devname, "wacom-tablet")) {
+    } else
+#endif
+    if (!strcmp(devname, "wacom-tablet")) {
         dev = usb_wacom_init();
     } else if (strstart(devname, "serial:", &p)) {
         dev = usb_serial_init(p);
-- 
1.6.3.rc4.29.g8146