cryptospore / rpms / qemu-kvm

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