62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
|
From 91465d5e7cb407604fd8697587a52aafe0040ad7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
||
|
|
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 <dgilbert@redhat.com>
|
||
|
|
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é <philmd@redhat.com>
|
||
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
|
||
|
|
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 <dgilbert@redhat.com>
|
||
|
|
Message-Id: <20210914131716.102851-1-dgilbert@redhat.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
||
|
|
(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
|
||
|
|
|