From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBN16-0006V9-3f for qemu-devel@nongnu.org; Mon, 19 Aug 2013 06:49:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBN0w-0006vv-Iu for qemu-devel@nongnu.org; Mon, 19 Aug 2013 06:48:56 -0400 Received: from mx3-phx2.redhat.com ([209.132.183.24]:34599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBN0w-0006vd-BS for qemu-devel@nongnu.org; Mon, 19 Aug 2013 06:48:46 -0400 Received: from zmail17.collab.prod.int.phx2.redhat.com (zmail17.collab.prod.int.phx2.redhat.com [10.5.83.19]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r7JAmjLw027280 for ; Mon, 19 Aug 2013 06:48:45 -0400 Date: Mon, 19 Aug 2013 06:48:44 -0400 (EDT) From: Miroslav Rezanina Message-ID: <52081254.597343.1376909324949.JavaMail.root@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Make usb-bt-dongle configurable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org usb-bt-dongle device can't be disabled as there's dependency in vl.c file. This patch add preprocesor condition to be able to disable it. Signed-off-by: Miroslav Rezanina --- hw/usb/Makefile.objs | 1 - vl.c | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index f9695e7..8892ffd 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -20,7 +20,6 @@ common-obj-$(CONFIG_USB_SERIAL) += dev-serial.o common-obj-$(CONFIG_USB_NETWORK) += dev-network.o # FIXME: make configurable too -CONFIG_USB_BLUETOOTH := y common-obj-$(CONFIG_USB_BLUETOOTH) += dev-bluetooth.o ifeq ($(CONFIG_USB_SMARTCARD),y) diff --git a/vl.c b/vl.c index f422a1c..4330b6d 100644 --- a/vl.c +++ b/vl.c @@ -1526,8 +1526,10 @@ static void configure_msg(QemuOpts *opts) static int usb_device_add(const char *devname) { - const char *p; USBDevice *dev = NULL; +#if defined(CONFIG_USB_BLUETOOTH) || !defined(CONFIG_LINUX) + const char *p; +#endif if (!usb_enabled(false)) { return -1; @@ -1543,15 +1545,23 @@ static int usb_device_add(const char *devname) /* only the linux version is qdev-ified, usb-bsd still needs this */ if (strstart(devname, "host:", &p)) { dev = usb_host_device_open(usb_bus_find(-1), p); - } else + goto devtest; + } #endif +#ifdef CONFIG_USB_BLUETOOTH if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) { dev = usb_bt_init(usb_bus_find(-1), devname[2] ? hci_init(p) : bt_new_hci(qemu_find_bt_vlan(0))); - } else { - return -1; + goto devtest; } +#endif + + return -1; + +#if defined(CONFIG_USB_BLUETOOTH) || !defined(CONFIG_LINUX) +devtest: +#endif if (!dev) return -1; -- 1.8.3.1