From ab739ef3071538abbc8c376e6c9c2bfe5e8811a8 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 2 Oct 2009 16:51:29 -0300
Subject: [PATCH 2/7] Now that we have disable bluetooth, disable also -bt command line option.

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <1253186607-14123-1-git-send-email-quintela@redhat.com>
Patchwork-id: 3436
O-Subject: [PATCH] Now that we have disable bluetooth,
	disable also -bt command line option.
Bugzilla: 516672
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>

Once there, also disable bluetooth help.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/vl.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/vl.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/qemu/vl.c b/qemu/vl.c
index 54b7c41..ef82b42 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -4295,6 +4295,7 @@ static void help(int exitcode)
            "-net none       use it alone to have zero network devices; if no -net option\n"
            "                is provided, the default is '-net nic -net user'\n"
            "\n"
+#ifdef CONFIG_BLUEZ
            "-bt hci,null    Dumb bluetooth HCI - doesn't respond to commands\n"
            "-bt hci,host[:id]\n"
            "                Use host's HCI with the given name\n"
@@ -4305,6 +4306,7 @@ static void help(int exitcode)
            "-bt device:dev[,vlan=n]\n"
            "                Emulate a bluetooth device 'dev' in scatternet 'n'\n"
            "\n"
+#endif
 #ifdef CONFIG_SLIRP
            "-tftp dir       allow tftp access to files in dir [-net user]\n"
            "-bootp file     advertise file in BOOTP replies\n"
@@ -4458,7 +4460,9 @@ enum {
     QEMU_OPTION_bootp,
     QEMU_OPTION_smb,
     QEMU_OPTION_redir,
+#ifdef CONFIG_BLUEZ
     QEMU_OPTION_bt,
+#endif
 
     QEMU_OPTION_kernel,
     QEMU_OPTION_append,
@@ -4588,7 +4592,9 @@ static const QEMUOption qemu_options[] = {
 #endif
     { "redir", HAS_ARG, QEMU_OPTION_redir },
 #endif
+#ifdef CONFIG_BLUEZ
     { "bt", HAS_ARG, QEMU_OPTION_bt },
+#endif
 
     { "kernel", HAS_ARG, QEMU_OPTION_kernel },
     { "append", HAS_ARG, QEMU_OPTION_append },
-- 
1.6.3.rc4.29.g8146