cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
d740ea
From d930ba960a1abaf8b76e507707a7fe081a376741 Mon Sep 17 00:00:00 2001
d740ea
From: Miroslav Rezanina <mrezanin@redhat.com>
d740ea
Date: Mon, 17 Dec 2018 11:04:15 +0100
d740ea
Subject: [PATCH 2/2] Do not build bluetooth support
d740ea
d740ea
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
d740ea
Message-id: <1545044655-7801-1-git-send-email-mrezanin@redhat.com>
d740ea
Patchwork-id: 83537
d740ea
O-Subject: [RHEL-7.7 qemu-kvm PATCH] Do not build bluetooth support
d740ea
Bugzilla: 1654627
d740ea
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
d740ea
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
d740ea
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
d740ea
d740ea
From: Miroslav Rezanina <mrezanin@redhat.com>
d740ea
d740ea
We do not support bt devices however some bt related code is built in.
d740ea
As this code is deprecated upstream disabling build of this code downstream.
d740ea
d740ea
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
d740ea
---
d740ea
 Makefile.objs       | 2 +-
d740ea
 hw/bt/Makefile.objs | 4 ++--
d740ea
 qemu-options.hx     | 2 ++
d740ea
 vl.c                | 6 ++++++
d740ea
 4 files changed, 11 insertions(+), 3 deletions(-)
d740ea
d740ea
diff --git a/Makefile.objs b/Makefile.objs
d740ea
index 74f722e44e..1712ee6133 100644
d740ea
--- a/Makefile.objs
d740ea
+++ b/Makefile.objs
d740ea
@@ -64,7 +64,7 @@ common-obj-y += audio/
d740ea
 common-obj-y += hw/
d740ea
 
d740ea
 common-obj-y += ui/
d740ea
-common-obj-y += bt-host.o bt-vhci.o
d740ea
+#common-obj-y += bt-host.o bt-vhci.o
d740ea
 
d740ea
 common-obj-y += dma-helpers.o
d740ea
 common-obj-y += vl.o
d740ea
diff --git a/hw/bt/Makefile.objs b/hw/bt/Makefile.objs
d740ea
index 867a7d2e8a..e678e9ee3c 100644
d740ea
--- a/hw/bt/Makefile.objs
d740ea
+++ b/hw/bt/Makefile.objs
d740ea
@@ -1,3 +1,3 @@
d740ea
-common-obj-y += core.o l2cap.o sdp.o hci.o hid.o
d740ea
-common-obj-y += hci-csr.o
d740ea
+#common-obj-y += core.o l2cap.o sdp.o hci.o hid.o
d740ea
+#common-obj-y += hci-csr.o
d740ea
 
d740ea
diff --git a/qemu-options.hx b/qemu-options.hx
d740ea
index 24ffab6a50..bcf1b8f755 100644
d740ea
--- a/qemu-options.hx
d740ea
+++ b/qemu-options.hx
d740ea
@@ -2157,6 +2157,7 @@ STEXI
d740ea
 @end table
d740ea
 ETEXI
d740ea
 
d740ea
+#if 0
d740ea
 DEFHEADING(Bluetooth(R) options:)
d740ea
 STEXI
d740ea
 @table @option
d740ea
@@ -2231,6 +2232,7 @@ STEXI
d740ea
 @end table
d740ea
 ETEXI
d740ea
 DEFHEADING()
d740ea
+#endif
d740ea
 
d740ea
 #ifdef CONFIG_TPM
d740ea
 DEFHEADING(TPM device options:)
d740ea
diff --git a/vl.c b/vl.c
d740ea
index 7c34b7c64f..5c5cdbe88b 100644
d740ea
--- a/vl.c
d740ea
+++ b/vl.c
d740ea
@@ -840,6 +840,7 @@ static void configure_rtc(QemuOpts *opts)
d740ea
     }
d740ea
 }
d740ea
 
d740ea
+#if 0 // Disabled for Red Hat Enterprise Linux
d740ea
 /***********************************************************/
d740ea
 /* Bluetooth support */
d740ea
 static int nb_hcis;
d740ea
@@ -961,6 +962,7 @@ static int bt_parse(const char *opt)
d740ea
     fprintf(stderr, "qemu: bad bluetooth parameter '%s'\n", opt);
d740ea
     return 1;
d740ea
 }
d740ea
+#endif
d740ea
 
d740ea
 static int parse_sandbox(QemuOpts *opts, void *opaque)
d740ea
 {
d740ea
@@ -3132,9 +3134,11 @@ int main(int argc, char **argv, char **envp)
d740ea
                     exit(1);
d740ea
                 break;
d740ea
 #endif
d740ea
+#if 0 // Disabled for Red Hat Enterprise Linux
d740ea
             case QEMU_OPTION_bt:
d740ea
                 add_device_config(DEV_BT, optarg);
d740ea
                 break;
d740ea
+#endif
d740ea
             case QEMU_OPTION_audio_help:
d740ea
                 AUD_help ();
d740ea
                 exit (0);
d740ea
@@ -4113,9 +4117,11 @@ int main(int argc, char **argv, char **envp)
d740ea
     }
d740ea
 #endif
d740ea
 
d740ea
+#if 0 // Disabled for Red Hat Enterprise Linux
d740ea
     /* init the bluetooth world */
d740ea
     if (foreach_device_config(DEV_BT, bt_parse))
d740ea
         exit(1);
d740ea
+#endif
d740ea
 
d740ea
     if (!xen_enabled()) {
d740ea
         /* On 32-bit hosts, QEMU is limited by virtual address space */
d740ea
-- 
d740ea
2.19.1
d740ea