vl: Allow building with CONFIG_BLUETOOTH disabled
cover vl: Allow building with CONFIG_BLUETOOTH disabled
A series of obvious patches to build without the deprecated bluetooth devices. Still worth for 4.1 or too late? It is clearly not a bugfix.
Regards,
Phil.
Philippe Mathieu-Daudé (7):
hw/arm: Nokia N-series tablet requires Bluetooth hw/usb: Bluetooth HCI USB depends on USB & BLUETOOTH
MAINTAINERS: Add a Bluetooth entry
vl: Fix 'braces' coding style issues
vl: Use qemu_strtoi() instead of strtol()
vl: Extract bt_parse() into its own file hw/bt: Allow building with CONFIG_BLUETOOTH disabled
MAINTAINERS | 7 +++ Makefile.objs | 3 +- bt-opts.c | 140 ++++++++++++++++++++++++++++++++++++++++++++ bt-stubs.c | 18 ++++++ hw/arm/Kconfig | 1 + hw/bt/Makefile.objs | 4 +- hw/usb/Kconfig | 2 +- include/sysemu/bt.h | 3 + vl.c | 121 -------------------------------------- 9 files changed, 174 insertions(+), 125 deletions(-) create mode 100644 bt-opts.c create mode 100644 bt-stubs.c
Signature · 1 line
2.20.1
PATCH 1/7 hw/arm: Nokia N-series tablet requires Bluetooth
Missed in 4826ac6d192 because the Bluetooth devices are currently always enabled.
--- hw/arm/Kconfig | 1 + 1 file changed, 1 insertion(+)
hw/arm/Kconfig +1 -0
@@ -106,6 +106,7 @@ config NSERIES select LM832X # GPIO keyboard chip select TWL92230 # energy-management select TUSB6010 + select BLUETOOTH config OMAP bool
Signature · 1 line
2.20.1
Re: [Qemu-arm] [PATCH-for-4.1? 1/7] hw/arm: Nokia N-series tablet requires Bluetooth
Quoted 13 lines · Philippe Mathieu-Daudé
Missed in
4826ac6d192because the Bluetooth devices are currently always enabled.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/arm/Kconfig | 1 + 1 file changed, 1 insertion(+)hw/arm/Kconfig +0
-0
hw/arm/Kconfig config NSERIES · line 109
Quoted 4 lines
hw/arm/Kconfig +1
-0@@ -106,6 +106,7 @@ config NSERIES select LM832X # GPIO keyboard chip select TWL92230 # energy-management select TUSB6010 + select BLUETOOTH
Looking at hw/bt/Makefile.objs the BLUETOOTH switch seems to be completely unused?
Thomas
PATCH 2/7 hw/usb: Bluetooth HCI USB depends on USB & BLUETOOTH
In reply to Philippe Mathieu-Daudé--- hw/usb/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/usb/Kconfig +1 -1
@@ -82,7 +82,7 @@ config USB_NETWORK config USB_BLUETOOTH bool default y - depends on USB + depends on USB && BLUETOOTH config USB_SMARTCARD bool
Signature · 1 line
2.20.1
Re: [Qemu-arm] [PATCH-for-4.1 2/7] hw/usb: Bluetooth HCI USB depends on USB & BLUETOOTH
Quoted 11 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/usb/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/usb/Kconfig +0
-0
hw/usb/Kconfig config USB_NETWORK · line 88
Quoted 8 lines
hw/usb/Kconfig +1
-1@@ -82,7 +82,7 @@ config USB_NETWORK config USB_BLUETOOTH bool default y - depends on USB + depends on USB && BLUETOOTH config USB_SMARTCARD bool
Shouldn't it select BLUETOOTH instead?
Paolo
Re: [Qemu-arm] [PATCH-for-4.1 2/7] hw/usb: Bluetooth HCI USB depends on USB & BLUETOOTH
Quoted 17 lines · Paolo Bonzini
Quoted 16 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/usb/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/usb/Kconfig +1
-1@@ -82,7 +82,7 @@ config USB_NETWORK config USB_BLUETOOTH bool default y - depends on USB + depends on USB && BLUETOOTH
Quoted 5 lines
hw/usb/Kconfig config USB_NETWORK · line 88
Quoted 3 lines
hw/usb/Kconfig +0
-0config USB_SMARTCARD boolShouldn't it select BLUETOOTH instead?
I wondered but am not sure, it is default to Yes, but Bluetooth code is deprecated and print a big warning when you use it, so I think this device should not be selected as default, neither pull in the deprecated bluetooth code.
So personally I'd respin without 'default y'. If you have a good reason to use it, I can use 'select' instead.
Regards,
Phil.
Re: [Qemu-arm] [PATCH-for-4.1 2/7] hw/usb: Bluetooth HCI USB depends on USB & BLUETOOTH
Quoted 7 lines · Philippe Mathieu-Daudé
I wondered but am not sure, it is default to Yes, but Bluetooth code is deprecated and print a big warning when you use it, so I think this device should not be selected as default, neither pull in the deprecated bluetooth code.
So personally I'd respin without 'default y'. If you have a good reason to use it, I can use 'select' instead.
There are two separate questions. One is whether USB_BLUETOOTH should select BLUETOOTH and the answer there is almost certainly yes (in the words of kconfig.rst, BLUETOOTH is a "subsystem" while USB_BLUETOOTH is a "device"; devices select the bus that the device provides).
The other is whether we want to enable USB_BLUETOOTH by default. I wouldn't have any problem there, but if we disable it basically no one would ship/use it and we might as well delete the whole thing.
Paolo
Re: [Qemu-arm] [PATCH-for-4.1 2/7] hw/usb: Bluetooth HCI USB depends on USB & BLUETOOTH
Quoted 6 lines · Paolo Bonzini
Quoted 5 lines · Philippe Mathieu-Daudé
I wondered but am not sure, it is default to Yes, but Bluetooth code is deprecated and print a big warning when you use it, so I think this device should not be selected as default, neither pull in the deprecated bluetooth code.
Quoted 7 lines
Quoted 2 lines
So personally I'd respin without 'default y'. If you have a good reason to use it, I can use 'select' instead.
There are two separate questions. One is whether
USB_BLUETOOTHshould select BLUETOOTH and the answer there is almost certainly yes (in the words ofkconfig.rst, BLUETOOTH is a "subsystem" whileUSB_BLUETOOTHis a "device"; devices select the bus that the device provides).
Fair :)
Quoted 3 lines
The other is whether we want to enable
USB_BLUETOOTHby default. I wouldn't have any problem there, but if we disable it basically no one would ship/use it and we might as well delete the whole thing.
The only user is the ARM Nokia N-series board, so if we set default=n, the Bluetooth subsystem will be only be selected on arm-softmmu (and aarch64-softmmu).
This seems a sane cleanup. If another board wants to use the bluetooth code, it should probably move it out of the orphan status.
Re: [Qemu-arm] [PATCH-for-4.1 2/7] hw/usb: Bluetooth HCI USB depends on USB & BLUETOOTH
Quoted 11 lines · Philippe Mathieu-Daudé
Quoted 3 lines · Paolo Bonzini
The other is whether we want to enable
USB_BLUETOOTHby default. I wouldn't have any problem there, but if we disable it basically no one would ship/use it and we might as well delete the whole thing.The only user is the ARM Nokia N-series board, so if we set default=n, the Bluetooth subsystem will be only be selected on arm-softmmu (and aarch64-softmmu).
This seems a sane cleanup. If another board wants to use the bluetooth code, it should probably move it out of the orphan status.
Fair! ;)
Paolo
Re: [Qemu-arm] [PATCH-for-4.1 2/7] hw/usb: Bluetooth HCI USB depends on USB & BLUETOOTH
Hi Paolo,
Quoted 9 lines · Paolo Bonzini
Quoted 8 lines · Philippe Mathieu-Daudé
Quoted 3 lines · Paolo Bonzini
The other is whether we want to enable
USB_BLUETOOTHby default. I wouldn't have any problem there, but if we disable it basically no one would ship/use it and we might as well delete the whole thing.The only user is the ARM Nokia N-series board, so if we set default=n, the Bluetooth subsystem will be only be selected on arm-softmmu (and aarch64-softmmu).
Using (1):
+ default y if BLUETOOTH
depends on USB
+ select BLUETOOTH
I get:
KconfigDataError: cycle found including BLUETOOTH
This works but doesn't follow kconfig.rst (2):
+ default y if BLUETOOTH
depends on USB
This works (kconfig.rst compliant, 3):
+ default n
depends on USB
+ select BLUETOOTH
Are you OK with (2) or you prefer (3)?
Quoted 8 lines
Quoted 3 lines
This seems a sane cleanup. If another board wants to use the bluetooth code, it should probably move it out of the orphan status.
Fair! ;)
Paolo
PATCH 3/7 MAINTAINERS: Add an entry for the Bluetooth devices
In reply to Philippe Mathieu-Daudé--- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
@@ -1733,6 +1733,13 @@ F: hw/*/*xive* F: include/hw/*/*xive* F: docs/*/*xive* +Bluetooth +S: Orphan +F: bt-*.c +F: hw/bt/ +F: include/hw/bt.h +F: include/sysemu/bt.h + Subsystems ---------- Audio
Signature · 1 line
2.20.1
Re: [Qemu-arm] [PATCH-for-4.1? 3/7] MAINTAINERS: Add an entry for the Bluetooth devices
Cc'ing qemu-trivial@ to salvage this patch.
Quoted 24 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+)MAINTAINERS +7
-0@@ -1733,6 +1733,13 @@ F: hw/*/*xive* F: include/hw/*/*xive* F: docs/*/*xive* +Bluetooth +S: Orphan +F: bt-*.c +F: hw/bt/ +F: include/hw/bt.h +F: include/sysemu/bt.h + Subsystems ---------- Audio
PATCH 4/7 vl: Fix 'braces' coding style issues
In reply to Philippe Mathieu-DaudéSince we'll move this code around, fix its style first:
ERROR: braces {} are necessary for all arms of this statement style
--- vl.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
vl.c +18 -9
@@ -920,8 +920,9 @@ static struct HCIInfo *hci_table[MAX_NICS];struct HCIInfo *qemu_next_hci (void ) { -if (cur_hci == nb_hcis) +if (cur_hci == nb_hcis) {return &null_hci; + }return hci_table[cur_hci++]; }
@@ -937,8 +938,9 @@ static int bt_hci_parse(const char *str) } hci =hci_init (str); -if (!hci) +if (!hci) {return -1 ; + } bdaddr.b[0 ] =0x52 ; bdaddr.b[1 ] =0x54 ;
@@ -957,9 +959,10 @@ static void bt_vhci_add(int vlan_id) {struct bt_scatternet_s *vlan =qemu_find_bt_vlan (vlan_id); -if (!vlan->slave) +if (!vlan->slave) {warn_report ("adding a VHCI to an empty scatternet %i" , vlan_id); + }bt_vhci_init (bt_new_hci (vlan)); }
@@ -984,12 +987,14 @@ static struct bt_device_s *bt_device_add(const char *opt) vlan =qemu_find_bt_vlan (vlan_id); -if (!vlan->slave) +if (!vlan->slave) {warn_report ("adding a slave device to an empty scatternet %i" , vlan_id); + } -if (!strcmp (devname,"keyboard" )) +if (!strcmp (devname,"keyboard" )) {return bt_keyboard_init (vlan); + }error_report ("unsupported bluetooth device '%s'" , devname);return 0 ;
@@ -1002,9 +1007,11 @@ static int bt_parse(const char *opt)if (strstart (opt,"hci" , &endp)) {if (!*endp || *endp ==',' ) { -if (*endp) -if (!strstart (endp,",vlan=" ,0 )) +if (*endp) { +if (!strstart (endp,",vlan=" ,0 )) { opt = endp +1 ; + } + }return bt_hci_parse (opt); }
@@ -1021,14 +1028,16 @@ static int bt_parse(const char *opt)error_report ("bad parameter '%s'" , endp +1 );return 1 ; } - }else + }else { vlan =0 ; + }bt_vhci_add (vlan);return 0 ; } - }else if (strstart (opt,"device:" , &endp)) + }else if (strstart (opt,"device:" , &endp)) {return !bt_device_add (endp); + }error_report ("bad bluetooth parameter '%s'" , opt);return 1 ;
Signature · 1 line
2.20.1
PATCH 5/7 vl: Use qemu_strtoi() instead of strtol()
In reply to Philippe Mathieu-DaudéSince we'll move this code around, fix this checkpatch warning first:
ERROR: consider using qemu_strtol in preference to strtol
--- vl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
vl.c +2 -4
@@ -978,8 +978,7 @@ static struct bt_device_s *bt_device_add(const char *opt)pstrcpy (devname,MIN (sizeof (devname), len), opt);if (endp) { - vlan_id =strtol (endp +6 , &endp,0 ); -if (*endp) { +if (qemu_strtoi (endp +6 , (const char **)&endp,0 , &vlan_id) <0 ) {error_report ("unrecognised bluetooth vlan Id" );return 0 ; }
@@ -1019,8 +1018,7 @@ static int bt_parse(const char *opt)if (!*endp || *endp ==',' ) {if (*endp) {if (strstart (endp,",vlan=" , &p)) { - vlan =strtol (p, (char **) &endp,0 ); -if (*endp) { +if (qemu_strtoi (p, &endp,0 , &vlan) <0 ) {error_report ("bad scatternet '%s'" , p);return 1 ; }
Signature · 1 line
2.20.1
PATCH 6/7 vl: Extract bt_parse() into its own file
In reply to Philippe Mathieu-DaudéThis is required to be able to compile vl.c with CONFIG_BLUETOOTH disabled.
---
2300 lines less for the C preprocessor :)
--- Makefile.objs | 2 +- bt-opts.c | 140 ++++++++++++++++++++++++++++++++++++++++++++ include/sysemu/bt.h | 3 + vl.c | 128 ---------------------------------------- 4 files changed, 144 insertions(+), 129 deletions(-) create mode 100644 bt-opts.c
Makefile.objs +1 -1
@@ -65,7 +65,7 @@ common-obj-y += replay/ common-obj-y += ui/ common-obj-m += ui/ -common-obj-y += bt-host.o bt-vhci.o +common-obj-y += bt-host.o bt-vhci.o bt-opts.o bt-host.o-cflags := $(BLUEZ_CFLAGS) common-obj-y += dma-helpers.o
bt-opts.c new file +140 -0
140 lines not on this page · raw message
include/sysemu/bt.h +3 -0
@@ -17,4 +17,7 @@ typedef struct HCIInfo {struct HCIInfo *bt_host_hci (const char *id);struct HCIInfo *qemu_next_hci (void ); +/* TODO Convert bt-opts.c to opts_init() and remove from here. */ +int bt_parse (const char *opt); +#endif
vl.c +0 -128
140 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 7/7 hw/bt: Allow building with CONFIG_BLUETOOTH disabled
In reply to Philippe Mathieu-Daudé--- Makefile.objs | 3 ++- bt-stubs.c | 18 ++++++++++++++++++ hw/bt/Makefile.objs | 4 ++-- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 bt-stubs.c
Makefile.objs +2 -1
@@ -65,8 +65,9 @@ common-obj-y += replay/ common-obj-y += ui/ common-obj-m += ui/ -common-obj-y += bt-host.o bt-vhci.o bt-opts.o bt-host.o-cflags := $(BLUEZ_CFLAGS) +common-obj-$(CONFIG_BLUETOOTH) += bt-host.o bt-vhci.o bt-opts.o +common-obj-$(call lnot,$(CONFIG_BLUETOOTH)) += bt-stubs.o common-obj-y += dma-helpers.o common-obj-y += vl.o
bt-stubs.c new file +18 -0
@@ -0,0 +1,18 @@ +/* +* Bluetooth stubs. +* +* Copyright (c) 2019 Red Hat, Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "sysemu/bt.h" + +int bt_parse (const char *opt) +{ +error_report ("Bluetooth support is disabled" ); + +return 1 ; +}
hw/bt/Makefile.objs +2 -2
@@ -1,3 +1,3 @@ -common-obj-y += core.o l2cap.o sdp.o hci.o hid.o -common-obj-y += hci-csr.o +common-obj-$(CONFIG_BLUETOOTH) += core.o l2cap.o sdp.o hci.o hid.o +common-obj-$(CONFIG_BLUETOOTH) += hci-csr.o
Signature · 1 line
2.20.1
Re: [Qemu-arm] [PATCH-for-4.1? 7/7] hw/bt: Allow building with CONFIG_BLUETOOTH disabled
Quoted 52 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- Makefile.objs | 3 ++- bt-stubs.c | 18 ++++++++++++++++++ hw/bt/Makefile.objs | 4 ++-- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 bt-stubs.cMakefile.objs +2
-1@@ -65,8 +65,9 @@ common-obj-y += replay/ common-obj-y += ui/ common-obj-m += ui/ -common-obj-y += bt-host.o bt-vhci.o bt-opts.o bt-host.o-cflags := $(BLUEZ_CFLAGS) +common-obj-$(CONFIG_BLUETOOTH) += bt-host.o bt-vhci.o bt-opts.o +common-obj-$(call lnot,$(CONFIG_BLUETOOTH)) += bt-stubs.o common-obj-y += dma-helpers.o common-obj-y += vl.obt-stubs.c new file +18
-0@@ -0,0 +1,18 @@ +/* +* Bluetooth stubs. +* +* Copyright (c) 2019 Red Hat, Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "sysemu/bt.h" + +int bt_parse (const char *opt) +{ +error_report ("Bluetooth support is disabled" ); + +return 1 ; +}hw/bt/Makefile.objs +0
-0
hw/bt/Makefile.objs line 2
Quoted 4 lines
hw/bt/Makefile.objs +2
-2@@ -1,3 +1,3 @@ -common-obj-y += core.o l2cap.o sdp.o hci.o hid.o -common-obj-y += hci-csr.o +common-obj-$(CONFIG_BLUETOOTH) += core.o l2cap.o sdp.o hci.o hid.o +common-obj-$(CONFIG_BLUETOOTH) += hci-csr.o
... ok, so the BLUETOOTH switch gets used here. But I wonder whether we should have separate switches for the backends (i.e. the files here) and the guest devices (i.e. the ones in hw/bt/) ?
Thomas
Quoted 8 lines · Philippe Mathieu-Daudé
A series of obvious patches to build without the deprecated bluetooth devices. Still worth for 4.1 or too late? It is clearly not a bugfix.
Regards,
Phil.
Quoted 8 lines
Philippe Mathieu-Daudé (7):
hw/arm: Nokia N-series tablet requires Bluetooth hw/usb: Bluetooth HCI USB depends on USB & BLUETOOTH
MAINTAINERS: Add a Bluetooth entry
vl: Fix 'braces' coding style issues
vl: Useqemu_strtoi()instead ofstrtol()
vl: Extractbt_parse()into its own file hw/bt: Allow building withCONFIG_BLUETOOTHdisabled
All of this looks plausible to me to go along with the 4.1 deprecation.
r~
Quoted 3 lines · Philippe Mathieu-Daudé
A series of obvious patches to build without the deprecated bluetooth devices. Still worth for 4.1 or too late? It is clearly not a bugfix.
I wonder whether this series is worth the effort right now, or whether we should simply nuke the bluetooth code after 4.1 has been released?
Thomas
Quoted 7 lines · Thomas Huth
Quoted 3 lines · Philippe Mathieu-Daudé
A series of obvious patches to build without the deprecated bluetooth devices. Still worth for 4.1 or too late? It is clearly not a bugfix.
I wonder whether this series is worth the effort right now, or whether we should simply nuke the bluetooth code after 4.1 has been released?
Well, perfect is the enemy of good :)
This series is already done and is an improvement to what we have.
Regarding nuking it, it depends on the Nokia N-series boards, they might become useless without BT support.
Peter, as a maintainer of these boards, what do you prefer?
Thanks,
Phil.
Quoted 10 lines · Philippe Mathieu-Daudé
Quoted 7 lines · Thomas Huth
Quoted 3 lines · Philippe Mathieu-Daudé
A series of obvious patches to build without the deprecated bluetooth devices. Still worth for 4.1 or too late? It is clearly not a bugfix.
I wonder whether this series is worth the effort right now, or whether we should simply nuke the bluetooth code after 4.1 has been released?
Quoted 6 lines
Well, perfect is the enemy of good :)
This series is already done and is an improvement to what we have.
Regarding nuking it, it depends on the Nokia N-series boards, they might become useless without BT support.
Er, they're not useless at all without BT support. The BT hardware is a really tiny part that I doubt many users of the board models ever used. As long as we retain a "simulate doing nothing much" model of the BT device to show the guest I don't care whether the BT backend code disappears.
thanks
-- PMM
Quoted 14 lines · Peter Maydell
Quoted 13 lines · Philippe Mathieu-Daudé
Quoted 7 lines · Thomas Huth
Quoted 3 lines · Philippe Mathieu-Daudé
A series of obvious patches to build without the deprecated bluetooth devices. Still worth for 4.1 or too late? It is clearly not a bugfix.
I wonder whether this series is worth the effort right now, or whether we should simply nuke the bluetooth code after 4.1 has been released?
Well, perfect is the enemy of good :)
This series is already done and is an improvement to what we have.
Quoted 8 lines
Quoted 2 lines
Regarding nuking it, it depends on the Nokia N-series boards, they might become useless without BT support.
Er, they're not useless at all without BT support. The BT hardware is a really tiny part that I doubt many users of the board models ever used. As long as we retain a "simulate doing nothing much" model of the BT device to show the guest I don't care whether the BT backend code disappears.
OK, I won't insist then.
Quoted 18 lines · Philippe Mathieu-Daudé
Quoted 17 lines · Peter Maydell
Quoted 15 lines · Philippe Mathieu-Daudé
Quoted 7 lines · Thomas Huth
Quoted 3 lines · Philippe Mathieu-Daudé
A series of obvious patches to build without the deprecated bluetooth devices. Still worth for 4.1 or too late? It is clearly not a bugfix.
I wonder whether this series is worth the effort right now, or whether we should simply nuke the bluetooth code after 4.1 has been released?
Well, perfect is the enemy of good :)
This series is already done and is an improvement to what we have.
Regarding nuking it, it depends on the Nokia N-series boards, they might become useless without BT support.
Quoted 7 lines
Quoted 5 lines
Er, they're not useless at all without BT support. The BT hardware is a really tiny part that I doubt many users of the board models ever used. As long as we retain a "simulate doing nothing much" model of the BT device to show the guest I don't care whether the BT backend code disappears.
OK, I won't insist then.
Bluetooth is dead, long live BT!
v4.2.0-rc0 just got tagged. We should stop linking unmaintained dead code. If nobody step in to nuke BT, we should consider applying this series before we release QEMU 5.0 with dead Bluetooth. This approach is still better than burying our head in the sand.
On 07/11/2019 20.09, Philippe Mathieu-Daudé wrote:
[...]
Quoted 3 lines
Bluetooth is dead, long live BT!
v4.2.0-rc0 just got tagged. We should stop linking unmaintained dead code. If nobody step in to nuke BT, we should consider applying this series before we release QEMU 5.0 with dead Bluetooth. This approach is still better than burying our head in the sand.
FWIW, I'm planning to send some patches to remove the bluetooth code in the 5.0 development cycle. Unless you want to beat me to it. But I don't think it makes sense to still make this configurable. The bluetooth code has been marked as deprecated for a while now, and nobody spoke up that they are still using it (and as far as I can tell, it's currently not usable anymore anyway), so it should simply be removed now.
Thomas