diff --git a/kvm-virtio-balloon-Fix-page-poison-subsection-name.patch b/kvm-virtio-balloon-Fix-page-poison-subsection-name.patch new file mode 100644 index 0000000..68e542a --- /dev/null +++ b/kvm-virtio-balloon-Fix-page-poison-subsection-name.patch @@ -0,0 +1,61 @@ +From 91465d5e7cb407604fd8697587a52aafe0040ad7 Mon Sep 17 00:00:00 2001 +From: "Dr. David Alan Gilbert" +Date: Tue, 14 Sep 2021 14:17:16 +0100 +Subject: [PATCH 1/2] virtio-balloon: Fix page-poison subsection name +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RH-Author: Dr. David Alan Gilbert +RH-MergeRequest: 46: virtio-balloon: Fix page-poison subsection name +RH-Commit: [1/1] b5907c252dae636b4b145a6f13fbed4bf5fad9d2 (dagrh/c-9-s-qemu-kvm) +RH-Bugzilla: 1984401 +RH-Acked-by: Philippe Mathieu-Daudé +RH-Acked-by: David Hildenbrand +RH-Acked-by: Cornelia Huck + +The subsection name for page-poison was typo'd as: + + vitio-balloon-device/page-poison + +Note the missing 'r' in virtio. + +When we have a machine type that enables page poison, and the guest +enables it (which needs a new kernel), things fail rather unpredictably. + +The fallout from this is that most of the other subsections fail to +load, including things like the feature bits in the device, one +possible fallout is that the physical addresses of the queues +then get aligned differently and we fail with an error about +last_avail_idx being wrong. +It's not obvious to me why this doesn't produce a more obvious failure, +but virtio's vmstate loading is a bit open-coded. + +Fixes: 7483cbbaf82 ("virtio-balloon: Implement support for page poison reporting feature") +bz: https://bugzilla.redhat.com/show_bug.cgi?id=1984401 +Signed-off-by: Dr. David Alan Gilbert +Message-Id: <20210914131716.102851-1-dgilbert@redhat.com> +Reviewed-by: Michael S. Tsirkin +Signed-off-by: Michael S. Tsirkin +Reviewed-by: David Hildenbrand +(cherry picked from commit 243a9284a989a38e32ceb3990eb795f5cf6f3be0) +--- + hw/virtio/virtio-balloon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c +index 4b5d9e5e50..ced070d64f 100644 +--- a/hw/virtio/virtio-balloon.c ++++ b/hw/virtio/virtio-balloon.c +@@ -850,7 +850,7 @@ static const VMStateDescription vmstate_virtio_balloon_free_page_hint = { + }; + + static const VMStateDescription vmstate_virtio_balloon_page_poison = { +- .name = "vitio-balloon-device/page-poison", ++ .name = "virtio-balloon-device/page-poison", + .version_id = 1, + .minimum_version_id = 1, + .needed = virtio_balloon_page_poison_support, +-- +2.27.0 + diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 6cc3dd2..bdf83cd 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -117,9 +117,7 @@ Requires: %{name}-ui-opengl = %{epoch}:%{version}-%{release} \ %if %{have_usbredir} \ Requires: %{name}-hw-usbredir = %{epoch}:%{version}-%{release} \ %endif \ -Requires: %{name}-block-curl = %{epoch}:%{version}-%{release} \ Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release} \ -Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release} \ Requires: %{name}-audio-pa = %{epoch}:%{version}-%{release} # Since SPICE is removed from RHEL-9, the following Obsoletes: @@ -135,7 +133,7 @@ Obsoletes: %{name}-block-iscsi <= %{version} \ Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 6.1.0 -Release: 4%{?rcrel}%{?dist}%{?cc_suffix} +Release: 5%{?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) @@ -192,6 +190,8 @@ Patch21: kvm-tools-virtiofsd-Add-fstatfs64-syscall-to-the-seccomp.patch Patch22: kvm-redhat-Define-hw_compat_rhel_8_5.patch # For bz#1998943 - Add machine type compatibility update for 6.1 rebase [s390x] Patch23: kvm-redhat-Add-s390x-machine-type-compatibility-update-f.patch +# For bz#1984401 - fails to revert snapshot of a VM [balloon/page-poison] +Patch24: kvm-virtio-balloon-Fix-page-poison-subsection-name.patch # Source-git patches @@ -1183,6 +1183,14 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %endif %changelog +* Mon Oct 11 2021 Miroslav Rezanina - 6.1.0-5 +- kvm-virtio-balloon-Fix-page-poison-subsection-name.patch [bz#1984401] +- kvm-spec-Remove-block-curl-and-block-ssh-dependency.patch [bz#2010985] +- Resolves: bz#1984401 + (fails to revert snapshot of a VM [balloon/page-poison]) +- Resolves: bz#2010985 + (Remove dependency on qemu-kvm-block-curl and qemu-kvm-block-ssh [rhel-9.0.0]) + * Tue Oct 05 2021 Miroslav Rezanina - 6.1.0-4 - kvm-redhat-Define-hw_compat_rhel_8_5.patch [bz#1998943] - kvm-redhat-Add-s390x-machine-type-compatibility-update-f.patch [bz#1998943]