|
 |
9bac43 |
From 17abc4f5bd7df54a1e09e2f8a1086354ef69aa87 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
Date: Mon, 9 Oct 2017 12:32:48 +0200
|
|
|
9bac43 |
Subject: [PATCH 29/34] RHEL: Disable vfio-ccw and x-terminal3270 devices
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
Message-id: <1507552368-9245-13-git-send-email-thuth@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77030
|
|
|
9bac43 |
O-Subject: [RHEL-7.5 qemu-kvm-ma PATCH 12/12] RHEL: Disable vfio-ccw and x-terminal3270 devices
|
|
|
9bac43 |
Bugzilla: 1492033
|
|
|
9bac43 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
Upstream-status: downstream only
|
|
|
9bac43 |
|
|
|
9bac43 |
We don't support them in downstream RHEL, so disable them in
|
|
|
9bac43 |
the config files.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
default-configs/s390x-softmmu.mak | 6 ++++--
|
|
|
9bac43 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
|
|
|
9bac43 |
index 43dbf34..2846634 100644
|
|
|
9bac43 |
--- a/default-configs/s390x-softmmu.mak
|
|
|
9bac43 |
+++ b/default-configs/s390x-softmmu.mak
|
|
|
9bac43 |
@@ -3,8 +3,10 @@ CONFIG_PCI=y
|
|
|
9bac43 |
CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
CONFIG_VIRTIO=y
|
|
|
9bac43 |
CONFIG_SCLPCONSOLE=y
|
|
|
9bac43 |
-CONFIG_TERMINAL3270=y
|
|
|
9bac43 |
+# Disabled for Red Hat Enterprise Linux:
|
|
|
9bac43 |
+# CONFIG_TERMINAL3270=y
|
|
|
9bac43 |
CONFIG_S390_FLIC=y
|
|
|
9bac43 |
CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)
|
|
|
9bac43 |
-CONFIG_VFIO_CCW=$(CONFIG_LINUX)
|
|
|
9bac43 |
+# Disabled for Red Hat Enterprise Linux:
|
|
|
9bac43 |
+# CONFIG_VFIO_CCW=$(CONFIG_LINUX)
|
|
|
9bac43 |
CONFIG_WDT_DIAG288=y
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|