[Qemu-devel] [PATCH 02/15] Make --disable-bluez to really remove bluetooth support

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile  |    2 ++
 configure |    1 +
 vl.c      |   12 ++++++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a06c9bf..588523c 100644
--- a/Makefile
+++ b/Makefile
@@ -105,8 +105,10 @@ OBJS+=scsi-generic.o
 OBJS+=usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
 OBJS+=usb-serial.o usb-net.o
 OBJS+=sd.o ssi-sd.o
+ifdef CONFIG_BLUEZ
 OBJS+=bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
 OBJS+=bt-hci-csr.o
+endif
 OBJS+=buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
 OBJS+=qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o
 OBJS+=msmouse.o ps2.o
diff --git a/configure b/configure
index 5f11464..92a1466 100755
--- a/configure
+++ b/configure
@@ -1448,6 +1448,7 @@ echo "Install blobs     $blobs"
 echo -e "KVM support       $kvm"
 echo "fdt support       $fdt"
 echo "preadv support    $preadv"
+echo "bluetooth support $bluez"

 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
diff --git a/vl.c b/vl.c
index 60a00e1..914c907 100644
--- a/vl.c
+++ b/vl.c
@@ -1867,6 +1867,7 @@ int check_params(char *buf, int buf_size,
     return 0;
 }

+#ifdef CONFIG_BLUEZ
 /***********************************************************/
 /* Bluetooth support */
 static int nb_hcis;
@@ -2057,6 +2058,7 @@ static int bt_parse(const char *opt)
     fprintf(stderr, "qemu: bad bluetooth parameter '%s'\n", opt);
     return 1;
 }
+#endif /* CONFIG_BLUEZ */

 /***********************************************************/
 /* QEMU Block devices */
@@ -2716,10 +2718,14 @@ static int usb_device_add(const char *devname, int 
is_hotplug)
             return -1;
         nd_table[nic].model = "usb";
         dev = usb_net_init(&nd_table[nic]);
-    } else if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) {
+    } else
+#ifdef CONFIG_BLUEZ
+    if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) {
         dev = usb_bt_init(devname[2] ? hci_init(p) :
                         bt_new_hci(qemu_find_bt_vlan(0)));
-    } else {
+    } else
+#endif
+    {
         return -1;
     }
     if (!dev)
@@ -5872,10 +5878,12 @@ int main(int argc, char **argv, char **envp)

     net_client_check();

+#ifdef CONFIG_BLUEZ
     /* init the bluetooth world */
     for (i = 0; i < nb_bt_opts; i++)
         if (bt_parse(bt_opts[i]))
             exit(1);
+#endif

     /* init the memory */
     if (ram_size == 0)
-- 
1.6.2.2