From 9c01d5aaaa9e38fd5cb8f7911cc9b220851a361c Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Tue, 21 Jul 2009 22:27:10 +0200
Subject: [PATCH 06/16] add option to disable usb wacom tablets

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <a333584b16aaa33191188d4f6f75e9871c2140d5.1248207932.git.quintela@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Bugzilla: 512837
Obsoletes: <ae715a964ea090a7349127c13f76f60d0ef35496.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: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: "Daniel P. Berrange" <berrange@redhat.com>
---
 qemu/Makefile  |    5 ++++-
 qemu/configure |    9 +++++++++
 qemu/vl.c      |    5 ++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/qemu/Makefile b/qemu/Makefile
index 38b2f58..8fd84ad 100644
--- a/qemu/Makefile
+++ b/qemu/Makefile
@@ -83,10 +83,13 @@ 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-wacom.o
+OBJS+=usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o
 ifdef CONFIG_USB_MSD
 OBJS+=usb-msd.o
 endif
+ifdef CONFIG_USB_WACOM
+OBJS+=usb-wacom.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 5764842..9a19a53 100755
--- a/qemu/configure
+++ b/qemu/configure
@@ -178,6 +178,7 @@ smb="yes"
 scsi="yes"
 isapc="yes"
 usb_msd="yes"
+usb_wacom="yes"
 kvm="yes"
 kvm_nested="no"
 kvm_cap_pit="no"
@@ -422,6 +423,8 @@ for opt do
   ;;
   --disable-usb-msd) usb_msd="no"
   ;;
+  --disable-usb-wacom) usb_wacom="no"
+  ;;
   --disable-kvm) kvm="no"
   ;;
   --enable-profiler) profiler="yes"
@@ -578,6 +581,7 @@ 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-usb-wacom      disable usb wacom tablets"
 echo "  --disable-kvm            disable KVM acceleration support"
 echo "  --disable-nptl           disable usermode NPTL support"
 echo "  --enable-system          enable all system emulation targets"
@@ -1312,6 +1316,7 @@ echo "SCSI devices      $scsi"
 echo "ISAPC support     $isapc"
 echo "KVM nested        $kvm_nested"
 echo "USB storage       $usb_msd"
+echo "USB wacom         $usb_wacom"
 
 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -1615,6 +1620,10 @@ if test "$usb_msd" = "yes" ; then
   echo "CONFIG_USB_MSD=yes" >> $config_mak
   echo "#define CONFIG_USB_MSD 1" >> $config_h
 fi
+if test "$usb_wacom" = "yes" ; then
+  echo "CONFIG_USB_WACOM=yes" >> $config_mak
+  echo "#define CONFIG_USB_WACOM 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 367e877..90e0856 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -2807,9 +2807,12 @@ static int usb_device_add(const char *devname)
         dev = usb_msd_init(p);
     } else
 #endif
+#ifdef CONFIG_USB_WACOM
     if (!strcmp(devname, "wacom-tablet")) {
         dev = usb_wacom_init();
-    } else if (strstart(devname, "serial:", &p)) {
+    } else
+#endif
+   if (strstart(devname, "serial:", &p)) {
         dev = usb_serial_init(p);
 #ifdef CONFIG_BRLAPI
     } else if (!strcmp(devname, "braille")) {
-- 
1.6.3.rc4.29.g8146