yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-Disable-CONFIG_CAN_BUS-and-CONFIG_CAN_SJA1000.patch

26ba25
From 9caf292924a26cbfb7e46d232a0f32f706254866 Mon Sep 17 00:00:00 2001
26ba25
From: Danilo de Paula <ddepaula@redhat.com>
26ba25
Date: Fri, 7 Dec 2018 14:16:59 +0000
26ba25
Subject: [PATCH 2/2] Disable CONFIG_CAN_BUS and CONFIG_CAN_SJA1000
26ba25
MIME-Version: 1.0
26ba25
Content-Type: text/plain; charset=UTF-8
26ba25
Content-Transfer-Encoding: 8bit
26ba25
26ba25
RH-Author: Danilo de Paula <ddepaula@redhat.com>
26ba25
Message-id: <20181207141659.3485-1-ddepaula@redhat.com>
26ba25
Patchwork-id: 83304
26ba25
O-Subject: [RHEL-8.0/rhel qemu-kvm PATCH] Disable CONFIG_CAN_BUS and CONFIG_CAN_SJA1000
26ba25
Bugzilla: 1640042
26ba25
RH-Acked-by: Thomas Huth <thuth@redhat.com>
26ba25
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
26ba25
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
26ba25
26ba25
BZ: 1640042
26ba25
Branch: rhel8/master-2.12.0
26ba25
Branch: rhel8/master-3.1.0-rc2
26ba25
Upstream: Downstream only
26ba25
Brew: None
26ba25
26ba25
We currently compile qemu-kvm with CONFIG_CAN_SJA1000=y and
26ba25
CONFIG_CAN_BUS=y in default-configs/pci.mak.
26ba25
As far as I can see, this has currently no effect,
26ba25
since we already disabled the other CONFIG_CAN_* switches there
26ba25
(which control the inclusion of the emulated CAN devices).
26ba25
26ba25
Since we do not have any plans to support CAN in downstream, we should also disable
26ba25
CONFIG_CAN_BUS and CONFIG_CAN_SJA1000 in our downstream configuration.
26ba25
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 default-configs/pci.mak | 4 ++--
26ba25
 1 file changed, 2 insertions(+), 2 deletions(-)
26ba25
26ba25
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
26ba25
index 763c375..2277308 100644
26ba25
--- a/default-configs/pci.mak
26ba25
+++ b/default-configs/pci.mak
26ba25
@@ -31,8 +31,8 @@ CONFIG_AHCI=y
26ba25
 CONFIG_SERIAL=y
26ba25
 CONFIG_SERIAL_ISA=y
26ba25
 CONFIG_SERIAL_PCI=y
26ba25
-CONFIG_CAN_BUS=y
26ba25
-CONFIG_CAN_SJA1000=y
26ba25
+#CONFIG_CAN_BUS=y
26ba25
+#CONFIG_CAN_SJA1000=y
26ba25
 #CONFIG_CAN_PCI=y
26ba25
 #CONFIG_IPACK=y
26ba25
 CONFIG_WDT_IB6300ESB=y
26ba25
-- 
26ba25
1.8.3.1
26ba25