You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
123 lines
5.2 KiB
123 lines
5.2 KiB
4 weeks ago
|
From 77e24d71549454d7d7b9e83f882e2817a5da7fac Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||
|
|
Date: Thu, 16 May 2024 12:40:22 +0400
|
||
|
|
Subject: [PATCH 06/14] virtio-gpu: fix v2 migration
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
RH-MergeRequest: 250: virtio-gpu: fix v2 migration
|
||
|
|
RH-Jira: RHEL-36329
|
||
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [1/2] 55624c9074aaf1226ca3ae8a34744134cd8a4d9f (marcandre.lureau-rh/qemu-kvm-centos)
|
||
|
|
|
||
|
|
Commit dfcf74fa ("virtio-gpu: fix scanout migration post-load") broke
|
||
|
|
forward/backward version migration. Versioning of nested VMSD structures
|
||
|
|
is not straightforward, as the wire format doesn't have nested
|
||
|
|
structures versions. Introduce x-scanout-vmstate-version and a field
|
||
|
|
test to save/load appropriately according to the machine version.
|
||
|
|
|
||
|
|
Fixes: dfcf74fa ("virtio-gpu: fix scanout migration post-load")
|
||
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
Signed-off-by: Peter Xu <peterx@redhat.com>
|
||
|
|
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
|
||
|
|
Tested-by: Fiona Ebner <f.ebner@proxmox.com>
|
||
|
|
[fixed long lines]
|
||
|
|
Signed-off-by: Fabiano Rosas <farosas@suse.de>
|
||
|
|
|
||
|
|
Jira: https://issues.redhat.com/browse/RHEL-36329
|
||
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
(cherry picked from commit 40a23ef643664b5c1021a9789f9d680b6294fb50)
|
||
|
|
---
|
||
|
|
hw/core/machine.c | 1 +
|
||
|
|
hw/display/virtio-gpu.c | 30 ++++++++++++++++++++++--------
|
||
|
|
include/hw/virtio/virtio-gpu.h | 1 +
|
||
|
|
3 files changed, 24 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
||
|
|
index 0f256d9633..cf1d7faaaf 100644
|
||
|
|
--- a/hw/core/machine.c
|
||
|
|
+++ b/hw/core/machine.c
|
||
|
|
@@ -37,6 +37,7 @@ GlobalProperty hw_compat_8_2[] = {
|
||
|
|
{ "migration", "zero-page-detection", "legacy"},
|
||
|
|
{ TYPE_VIRTIO_IOMMU_PCI, "granule", "4k" },
|
||
|
|
{ TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "64" },
|
||
|
|
+ { "virtio-gpu-device", "x-scanout-vmstate-version", "1" },
|
||
|
|
};
|
||
|
|
const size_t hw_compat_8_2_len = G_N_ELEMENTS(hw_compat_8_2);
|
||
|
|
|
||
|
|
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
|
||
|
|
index ae831b6b3e..d60b1b2973 100644
|
||
|
|
--- a/hw/display/virtio-gpu.c
|
||
|
|
+++ b/hw/display/virtio-gpu.c
|
||
|
|
@@ -1166,10 +1166,17 @@ static void virtio_gpu_cursor_bh(void *opaque)
|
||
|
|
virtio_gpu_handle_cursor(&g->parent_obj.parent_obj, g->cursor_vq);
|
||
|
|
}
|
||
|
|
|
||
|
|
+static bool scanout_vmstate_after_v2(void *opaque, int version)
|
||
|
|
+{
|
||
|
|
+ struct VirtIOGPUBase *base = container_of(opaque, VirtIOGPUBase, scanout);
|
||
|
|
+ struct VirtIOGPU *gpu = container_of(base, VirtIOGPU, parent_obj);
|
||
|
|
+
|
||
|
|
+ return gpu->scanout_vmstate_version >= 2;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static const VMStateDescription vmstate_virtio_gpu_scanout = {
|
||
|
|
.name = "virtio-gpu-one-scanout",
|
||
|
|
- .version_id = 2,
|
||
|
|
- .minimum_version_id = 1,
|
||
|
|
+ .version_id = 1,
|
||
|
|
.fields = (const VMStateField[]) {
|
||
|
|
VMSTATE_UINT32(resource_id, struct virtio_gpu_scanout),
|
||
|
|
VMSTATE_UINT32(width, struct virtio_gpu_scanout),
|
||
|
|
@@ -1181,12 +1188,18 @@ static const VMStateDescription vmstate_virtio_gpu_scanout = {
|
||
|
|
VMSTATE_UINT32(cursor.hot_y, struct virtio_gpu_scanout),
|
||
|
|
VMSTATE_UINT32(cursor.pos.x, struct virtio_gpu_scanout),
|
||
|
|
VMSTATE_UINT32(cursor.pos.y, struct virtio_gpu_scanout),
|
||
|
|
- VMSTATE_UINT32_V(fb.format, struct virtio_gpu_scanout, 2),
|
||
|
|
- VMSTATE_UINT32_V(fb.bytes_pp, struct virtio_gpu_scanout, 2),
|
||
|
|
- VMSTATE_UINT32_V(fb.width, struct virtio_gpu_scanout, 2),
|
||
|
|
- VMSTATE_UINT32_V(fb.height, struct virtio_gpu_scanout, 2),
|
||
|
|
- VMSTATE_UINT32_V(fb.stride, struct virtio_gpu_scanout, 2),
|
||
|
|
- VMSTATE_UINT32_V(fb.offset, struct virtio_gpu_scanout, 2),
|
||
|
|
+ VMSTATE_UINT32_TEST(fb.format, struct virtio_gpu_scanout,
|
||
|
|
+ scanout_vmstate_after_v2),
|
||
|
|
+ VMSTATE_UINT32_TEST(fb.bytes_pp, struct virtio_gpu_scanout,
|
||
|
|
+ scanout_vmstate_after_v2),
|
||
|
|
+ VMSTATE_UINT32_TEST(fb.width, struct virtio_gpu_scanout,
|
||
|
|
+ scanout_vmstate_after_v2),
|
||
|
|
+ VMSTATE_UINT32_TEST(fb.height, struct virtio_gpu_scanout,
|
||
|
|
+ scanout_vmstate_after_v2),
|
||
|
|
+ VMSTATE_UINT32_TEST(fb.stride, struct virtio_gpu_scanout,
|
||
|
|
+ scanout_vmstate_after_v2),
|
||
|
|
+ VMSTATE_UINT32_TEST(fb.offset, struct virtio_gpu_scanout,
|
||
|
|
+ scanout_vmstate_after_v2),
|
||
|
|
VMSTATE_END_OF_LIST()
|
||
|
|
},
|
||
|
|
};
|
||
|
|
@@ -1659,6 +1672,7 @@ static Property virtio_gpu_properties[] = {
|
||
|
|
DEFINE_PROP_BIT("blob", VirtIOGPU, parent_obj.conf.flags,
|
||
|
|
VIRTIO_GPU_FLAG_BLOB_ENABLED, false),
|
||
|
|
DEFINE_PROP_SIZE("hostmem", VirtIOGPU, parent_obj.conf.hostmem, 0),
|
||
|
|
+ DEFINE_PROP_UINT8("x-scanout-vmstate-version", VirtIOGPU, scanout_vmstate_version, 2),
|
||
|
|
DEFINE_PROP_END_OF_LIST(),
|
||
|
|
};
|
||
|
|
|
||
|
|
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
|
||
|
|
index ed44cdad6b..842315d51d 100644
|
||
|
|
--- a/include/hw/virtio/virtio-gpu.h
|
||
|
|
+++ b/include/hw/virtio/virtio-gpu.h
|
||
|
|
@@ -177,6 +177,7 @@ typedef struct VGPUDMABuf {
|
||
|
|
struct VirtIOGPU {
|
||
|
|
VirtIOGPUBase parent_obj;
|
||
|
|
|
||
|
|
+ uint8_t scanout_vmstate_version;
|
||
|
|
uint64_t conf_max_hostmem;
|
||
|
|
|
||
|
|
VirtQueue *ctrl_vq;
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|