* Mon May 31 2021 Miroslav Rezanina <mrezanin@redhat.com> - 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)
This commit is contained in:
Miroslav Rezanina 2021-05-31 09:54:40 +02:00
parent 013897ee56
commit 261bc7bc3b
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,40 @@
From 5101527fb425c2d17ef04b0ed87b3810cf6db7bc Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cohuck@redhat.com>
Date: Wed, 26 May 2021 11:01:00 +0200
Subject: [PATCH] s390x/redhat: disable experimental 3270 device
RH-Author: Cornelia Huck <cohuck@redhat.com>
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 <thuth@redhat.com>
RH-Acked-by: David Hildenbrand <david@redhat.com>
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
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 <cohuck@redhat.com>
---
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

View File

@ -65,7 +65,7 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
Summary: QEMU is a machine emulator and virtualizer Summary: QEMU is a machine emulator and virtualizer
Name: qemu-kvm Name: qemu-kvm
Version: 6.0.0 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 because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
Epoch: 15 Epoch: 15
License: GPLv2 and GPLv2+ and CC-BY 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 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) # For bz#1944730 - Remove RHEL7 machine type (s390-ccw-virtio-rhel7.5.0)
Patch20: kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch 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: wget
BuildRequires: rpm-build BuildRequires: rpm-build
@ -1225,6 +1227,11 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || :
%endif %endif
%changelog %changelog
* Mon May 31 2021 Miroslav Rezanina <mrezanin@redhat.com> - 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 <mrezanin@redhat.com> - 6.0.0-3 * Tue May 25 2021 Miroslav Reznaina <mrezanin@redhat.com> - 6.0.0-3
- kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch [bz#1944730] - kvm-hw-s390x-Remove-the-RHEL7-only-machine-type.patch [bz#1944730]
- Resolves: bz#1944730 - Resolves: bz#1944730