diff --git a/kvm-disable-sga-device.patch b/kvm-disable-sga-device.patch new file mode 100644 index 0000000..75118bd --- /dev/null +++ b/kvm-disable-sga-device.patch @@ -0,0 +1,38 @@ +From 77d18ece20f69ff1e1f6afd4b2d8cf2a1f252f3a Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Mon, 20 Sep 2021 03:46:51 -0400 +Subject: [PATCH 1/2] disable sga device +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RH-Author: Miroslav Rezanina +RH-MergeRequest: 44: Apply RHEL 9.0.0 Beta fixes to RHEL 9.0.0 +RH-Commit: [1/2] 3d8e1b51b496175de71162c612abbd64adbcb9e5 (mrezanin/centos-src-qemu-kvm) +RH-Bugzilla: 2000845 +RH-Acked-by: Daniel P. Berrangé +RH-Acked-by: Gerd Hoffmann + +Disabling sga device we are going to not support anymore. + +Signed-off-by: Gerd Hoffmann +Signed-off-by: Miroslav Rezanina +--- + configs/devices/x86_64-softmmu/x86_64-rh-devices.mak | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak +index 24b96ba0c4..20c2991941 100644 +--- a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak ++++ b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak +@@ -67,7 +67,6 @@ CONFIG_SERIAL=y + CONFIG_SERIAL_ISA=y + CONFIG_SERIAL_PCI=y + CONFIG_SEV=y +-CONFIG_SGA=y + CONFIG_SMBIOS=y + CONFIG_SMBUS_EEPROM=y + CONFIG_TEST_DEVICES=y +-- +2.27.0 + diff --git a/kvm-tools-virtiofsd-Add-fstatfs64-syscall-to-the-seccomp.patch b/kvm-tools-virtiofsd-Add-fstatfs64-syscall-to-the-seccomp.patch new file mode 100644 index 0000000..1666b15 --- /dev/null +++ b/kvm-tools-virtiofsd-Add-fstatfs64-syscall-to-the-seccomp.patch @@ -0,0 +1,51 @@ +From b615b79feaa73bbaa32bb8c30401a4f6f0c0205e Mon Sep 17 00:00:00 2001 +From: Thomas Huth +Date: Tue, 14 Sep 2021 13:29:59 +0200 +Subject: [PATCH 2/2] tools/virtiofsd: Add fstatfs64 syscall to the seccomp + allowlist +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RH-Author: Miroslav Rezanina +RH-MergeRequest: 44: Apply RHEL 9.0.0 Beta fixes to RHEL 9.0.0 +RH-Commit: [2/2] 0085289cefb57d49d2423b4f3376e8cf4a970012 (mrezanin/centos-src-qemu-kvm) +RH-Bugzilla: 2005026 +RH-Acked-by: Daniel P. Berrangé +RH-Acked-by: Gerd Hoffmann + +The virtiofsd currently crashes on s390x when doing something like +this in the guest: + + mkdir -p /mnt/myfs + mount -t virtiofs myfs /mnt/myfs + touch /mnt/myfs/foo.txt + stat -f /mnt/myfs/foo.txt + +The problem is that the fstatfs64 syscall is called in this case +from the virtiofsd. We have to put it on the seccomp allowlist to +avoid that the daemon gets killed in this case. + +(cherry picked from commit 8cfd339b3d402f913fe520a4f35f30152fb4fb80) +Suggested-by: Vivek Goyal +Signed-off-by: Thomas Huth +Signed-off-by: Miroslav Rezanina +--- + tools/virtiofsd/passthrough_seccomp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/virtiofsd/passthrough_seccomp.c b/tools/virtiofsd/passthrough_seccomp.c +index f49ed94b5e..a3ce9f898d 100644 +--- a/tools/virtiofsd/passthrough_seccomp.c ++++ b/tools/virtiofsd/passthrough_seccomp.c +@@ -51,6 +51,7 @@ static const int syscall_allowlist[] = { + SCMP_SYS(fsetxattr), + SCMP_SYS(fstat), + SCMP_SYS(fstatfs), ++ SCMP_SYS(fstatfs64), + SCMP_SYS(fsync), + SCMP_SYS(ftruncate), + SCMP_SYS(futex), +-- +2.27.0 + diff --git a/qemu-kvm.spec b/qemu-kvm.spec index ff7f339..985bf5a 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -135,7 +135,7 @@ Obsoletes: %{name}-block-iscsi <= %{version} \ Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 6.1.0 -Release: 2%{?rcrel}%{?dist}%{?cc_suffix} +Release: 3%{?rcrel}%{?dist}%{?cc_suffix} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped # Epoch 15 used for RHEL 8 # Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5) @@ -184,6 +184,10 @@ Patch0017: 0017-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch Patch0018: 0018-qcow2-Deprecation-warning-when-opening-v2-images-rw.patch # For bz#2002937 - [qemu][aarch64] Remove 9.0 machine types in arm virt for 9-Beta Patch19: kvm-hw-arm-virt-Remove-9.0-machine-type.patch +# For bz#2000845 - RFE: Remove SGA, deprecate cirrus, and set defaults for QEMU machine-types in RHEL9 +Patch20: kvm-disable-sga-device.patch +# For bz#2005026 - [s390][virtio-fs] Umount virtiofs shared folder failure from guest side [rhel-9.0.0] +Patch21: kvm-tools-virtiofsd-Add-fstatfs64-syscall-to-the-seccomp.patch # Source-git patches @@ -1175,6 +1179,14 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %endif %changelog +* Fri Sep 24 2021 Miroslav Rezanina - 6.1.0-3 +- kvm-disable-sga-device.patch [bz#2000845] +- kvm-tools-virtiofsd-Add-fstatfs64-syscall-to-the-seccomp.patch [bz#2005026] +- Resolves: bz#2000845 + (RFE: Remove SGA, deprecate cirrus, and set defaults for QEMU machine-types in RHEL9) +- Resolves: bz#2005026 + ([s390][virtio-fs] Umount virtiofs shared folder failure from guest side [rhel-9.0.0]) + * Fri Sep 10 2021 Miroslav Rezanina - 6.1.0-2 - kvm-hw-arm-virt-Remove-9.0-machine-type.patch [bz#2002937] - kvm-remove-sgabios-dependency.patch [bz#2000845]