ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-gpu: move scanout restoration to post_load 

As we are going to introduce an extra subsection for "blob" resources,
scanout have to be restored after.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Marc-André Lureau 2023-09-07 17:02:53 +04:00
parent e92ffae6ba
commit 0f2a301db3
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/display/virtio-gpu.c
View File

@ -1267,7 +1267,6 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,
{ {
VirtIOGPU *g = opaque; VirtIOGPU *g = opaque;
struct virtio_gpu_simple_resource *res; struct virtio_gpu_simple_resource *res;
struct virtio_gpu_scanout *scanout;
uint32_t resource_id, pformat; uint32_t resource_id, pformat;
void *bits = NULL; void *bits = NULL;
int i; int i;
@ -1337,6 +1336,17 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,
/* load & apply scanout state */ /* load & apply scanout state */
vmstate_load_state(f, &vmstate_virtio_gpu_scanouts, g, 1); vmstate_load_state(f, &vmstate_virtio_gpu_scanouts, g, 1);
return 0;
}
static int virtio_gpu_post_load(void *opaque, int version_id)
{
VirtIOGPU *g = opaque;
struct virtio_gpu_scanout *scanout;
struct virtio_gpu_simple_resource *res;
int i;
for (i = 0; i < g->parent_obj.conf.max_outputs; i++) { for (i = 0; i < g->parent_obj.conf.max_outputs; i++) {
/* FIXME: should take scanout.r.{x,y} into account */ /* FIXME: should take scanout.r.{x,y} into account */
scanout = &g->parent_obj.scanout[i]; scanout = &g->parent_obj.scanout[i];
@ -1520,6 +1530,7 @@ static const VMStateDescription vmstate_virtio_gpu = {
} /* device */, } /* device */,
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },
.post_load = virtio_gpu_post_load,
}; };
static Property virtio_gpu_properties[] = { static Property virtio_gpu_properties[] = {