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

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