|
 |
ae23c9 |
From b579d3287a75db4b7ee37d25d99b2087f4ed4475 Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
ae23c9 |
Date: Fri, 30 Nov 2018 13:58:43 +0000
|
|
|
ae23c9 |
Subject: [PATCH 08/16] Do not build bluetooth support
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
ae23c9 |
Message-id: <1543586323-7323-1-git-send-email-mrezanin@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 83193
|
|
|
ae23c9 |
O-Subject: [RHEL-8 qemu-kvm PATCHv2] Do not build bluetooth support
|
|
|
ae23c9 |
Bugzilla: 1654651
|
|
|
ae23c9 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1654651
|
|
|
ae23c9 |
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=19329246
|
|
|
ae23c9 |
Branch: rhel8/master-2.12.0
|
|
|
ae23c9 |
|
|
|
ae23c9 |
We do not support bt devices however some bt related code is built in.
|
|
|
ae23c9 |
As this code is deprecated upstream disabling build of this code downstream.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
v2:
|
|
|
ae23c9 |
- Removed -bt option from qemu-options.hx
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
Makefile.objs | 4 ++--
|
|
|
ae23c9 |
hw/bt/Makefile.objs | 4 ++--
|
|
|
ae23c9 |
qemu-options.hx | 2 ++
|
|
|
ae23c9 |
vl.c | 7 +++++++
|
|
|
ae23c9 |
4 files changed, 13 insertions(+), 4 deletions(-)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/Makefile.objs b/Makefile.objs
|
|
|
ae23c9 |
index c6c3554..be72238 100644
|
|
|
ae23c9 |
--- a/Makefile.objs
|
|
|
ae23c9 |
+++ b/Makefile.objs
|
|
|
ae23c9 |
@@ -115,8 +115,8 @@ common-obj-y += replay/
|
|
|
ae23c9 |
|
|
|
ae23c9 |
common-obj-y += ui/
|
|
|
ae23c9 |
common-obj-m += ui/
|
|
|
ae23c9 |
-common-obj-y += bt-host.o bt-vhci.o
|
|
|
ae23c9 |
-bt-host.o-cflags := $(BLUEZ_CFLAGS)
|
|
|
ae23c9 |
+#common-obj-y += bt-host.o bt-vhci.o
|
|
|
ae23c9 |
+#bt-host.o-cflags := $(BLUEZ_CFLAGS)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
common-obj-y += dma-helpers.o
|
|
|
ae23c9 |
common-obj-y += vl.o
|
|
|
ae23c9 |
diff --git a/hw/bt/Makefile.objs b/hw/bt/Makefile.objs
|
|
|
ae23c9 |
index 867a7d2..e678e9e 100644
|
|
|
ae23c9 |
--- a/hw/bt/Makefile.objs
|
|
|
ae23c9 |
+++ b/hw/bt/Makefile.objs
|
|
|
ae23c9 |
@@ -1,3 +1,3 @@
|
|
|
ae23c9 |
-common-obj-y += core.o l2cap.o sdp.o hci.o hid.o
|
|
|
ae23c9 |
-common-obj-y += hci-csr.o
|
|
|
ae23c9 |
+#common-obj-y += core.o l2cap.o sdp.o hci.o hid.o
|
|
|
ae23c9 |
+#common-obj-y += hci-csr.o
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/qemu-options.hx b/qemu-options.hx
|
|
|
ae23c9 |
index 4271cd3..2e05112 100644
|
|
|
ae23c9 |
--- a/qemu-options.hx
|
|
|
ae23c9 |
+++ b/qemu-options.hx
|
|
|
ae23c9 |
@@ -2827,6 +2827,7 @@ STEXI
|
|
|
ae23c9 |
ETEXI
|
|
|
ae23c9 |
DEFHEADING()
|
|
|
ae23c9 |
|
|
|
ae23c9 |
+#if 0
|
|
|
ae23c9 |
DEFHEADING(Bluetooth(R) options:)
|
|
|
ae23c9 |
STEXI
|
|
|
ae23c9 |
@table @option
|
|
|
ae23c9 |
@@ -2901,6 +2902,7 @@ STEXI
|
|
|
ae23c9 |
@end table
|
|
|
ae23c9 |
ETEXI
|
|
|
ae23c9 |
DEFHEADING()
|
|
|
ae23c9 |
+#endif
|
|
|
ae23c9 |
|
|
|
ae23c9 |
#ifdef CONFIG_TPM
|
|
|
ae23c9 |
DEFHEADING(TPM device options:)
|
|
|
ae23c9 |
diff --git a/vl.c b/vl.c
|
|
|
ae23c9 |
index f253876..74fa8f2 100644
|
|
|
ae23c9 |
--- a/vl.c
|
|
|
ae23c9 |
+++ b/vl.c
|
|
|
ae23c9 |
@@ -923,6 +923,7 @@ static void configure_rtc(QemuOpts *opts)
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
+#if 0 // Disabled for Red Hat Enterprise Linux
|
|
|
ae23c9 |
/***********************************************************/
|
|
|
ae23c9 |
/* Bluetooth support */
|
|
|
ae23c9 |
static int nb_hcis;
|
|
|
ae23c9 |
@@ -1044,6 +1045,7 @@ static int bt_parse(const char *opt)
|
|
|
ae23c9 |
error_report("bad bluetooth parameter '%s'", opt);
|
|
|
ae23c9 |
return 1;
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
+#endif
|
|
|
ae23c9 |
|
|
|
ae23c9 |
static int parse_sandbox(void *opaque, QemuOpts *opts, Error **errp)
|
|
|
ae23c9 |
{
|
|
|
ae23c9 |
@@ -3367,9 +3369,12 @@ int main(int argc, char **argv, char **envp)
|
|
|
ae23c9 |
exit(1);
|
|
|
ae23c9 |
break;
|
|
|
ae23c9 |
#endif
|
|
|
ae23c9 |
+
|
|
|
ae23c9 |
+#if 0 // Disabled for Red Hat Enterprise Linux
|
|
|
ae23c9 |
case QEMU_OPTION_bt:
|
|
|
ae23c9 |
add_device_config(DEV_BT, optarg);
|
|
|
ae23c9 |
break;
|
|
|
ae23c9 |
+#endif
|
|
|
ae23c9 |
case QEMU_OPTION_audio_help:
|
|
|
ae23c9 |
AUD_help ();
|
|
|
ae23c9 |
exit (0);
|
|
|
ae23c9 |
@@ -4523,9 +4528,11 @@ int main(int argc, char **argv, char **envp)
|
|
|
ae23c9 |
exit(1);
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
+#if 0 // Disabled for Red Hat Enterprise Linux
|
|
|
ae23c9 |
/* init the bluetooth world */
|
|
|
ae23c9 |
if (foreach_device_config(DEV_BT, bt_parse))
|
|
|
ae23c9 |
exit(1);
|
|
|
ae23c9 |
+#endif
|
|
|
ae23c9 |
|
|
|
ae23c9 |
if (!xen_enabled()) {
|
|
|
ae23c9 |
/* On 32-bit hosts, QEMU is limited by virtual address space */
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|