From 261bc7bc3b647f38f110cc375dcb4b0e0ccfcdb4 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Mon, 31 May 2021 09:54:40 +0200 Subject: [PATCH] * Mon May 31 2021 Miroslav Rezanina - 6.0.0-4 - kvm-s390x-redhat-disable-experimental-3270-device.patch - Resolves: bz#1962479 (Disable the 'x-terminal3270' device in qemu-kvm on s390x) --- ...hat-disable-experimental-3270-device.patch | 40 +++++++++++++++++++ qemu-kvm.spec | 9 ++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 kvm-s390x-redhat-disable-experimental-3270-device.patch diff --git a/kvm-s390x-redhat-disable-experimental-3270-device.patch b/kvm-s390x-redhat-disable-experimental-3270-device.patch new file mode 100644 index 0000000..232da25 --- /dev/null +++ b/kvm-s390x-redhat-disable-experimental-3270-device.patch @@ -0,0 +1,40 @@ +From 5101527fb425c2d17ef04b0ed87b3810cf6db7bc Mon Sep 17 00:00:00 2001 +From: Cornelia Huck +Date: Wed, 26 May 2021 11:01:00 +0200 +Subject: [PATCH] s390x/redhat: disable experimental 3270 device + +RH-Author: Cornelia Huck +RH-MergeRequest: 9: Disable the 'x-terminal3270' device in qemu-kvm on s390x +RH-Commit: [1/1] 1df70e856fba434d06587a05c44c4dc5a367f1f7 (cohuck/qemu-kvm) +RH-Bugzilla: 1962479 +RH-Acked-by: Thomas Huth +RH-Acked-by: David Hildenbrand +RH-Acked-by: Miroslav Rezanina + +The "x-terminal3270" device has been experimental for years, +has known limitations, has no known users anymore, and is not +supported by libvirt. + +Therefore, disable it in our downstream builds, as it is not +really supported. + +Signed-off-by: Cornelia Huck +--- + default-configs/devices/s390x-rh-devices.mak | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/default-configs/devices/s390x-rh-devices.mak b/default-configs/devices/s390x-rh-devices.mak +index 08a15f3e01..fe8613b8f6 100644 +--- a/default-configs/devices/s390x-rh-devices.mak ++++ b/default-configs/devices/s390x-rh-devices.mak +@@ -6,7 +6,6 @@ CONFIG_S390_FLIC=y + CONFIG_S390_FLIC_KVM=y + CONFIG_SCLPCONSOLE=y + CONFIG_SCSI=y +-CONFIG_TERMINAL3270=y + CONFIG_VFIO=y + CONFIG_VFIO_AP=y + CONFIG_VFIO_CCW=y +-- +2.27.0 + diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 2a6e82a..3eb1eaa 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -65,7 +65,7 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release} Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 6.0.0 -Release: 3%{?rcversion}%{?dist} +Release: 4%{?rcversion}%{?dist} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped Epoch: 15 License: GPLv2 and GPLv2+ and CC-BY @@ -119,6 +119,8 @@ Patch0018: 0018-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch Patch19: kvm-Remove-SPICE-and-QXL-from-x86_64-rh-devices.mak.patch # For bz#1944730 - Remove RHEL7 machine type (s390-ccw-virtio-rhel7.5.0) Patch20: kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch +# For bz#1962479 - Disable the 'x-terminal3270' device in qemu-kvm on s390x +Patch21: kvm-s390x-redhat-disable-experimental-3270-device.patch BuildRequires: wget BuildRequires: rpm-build @@ -1225,6 +1227,11 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || : %endif %changelog +* Mon May 31 2021 Miroslav Rezanina - 6.0.0-4 +- kvm-s390x-redhat-disable-experimental-3270-device.patch +- Resolves: bz#1962479 + (Disable the 'x-terminal3270' device in qemu-kvm on s390x) + * Tue May 25 2021 Miroslav Reznaina - 6.0.0-3 - kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch [bz#1944730] - Resolves: bz#1944730