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

virtio-gpu: Use migrate_add_blocker for virgl migration blocking 

virgl conditionally registers a vmstate as unmigratable when virgl
is enabled; instead use the migrate_add_blocker mechanism.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2016-07-14 18:22:54 +01:00 committed by Michael S. Tsirkin
parent 428d2ed2c8
commit de8892215e
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-gpu.h" #include "hw/virtio/virtio-gpu.h"
#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-bus.h"
#include "migration/migration.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qapi/error.h" #include "qapi/error.h"
@ -986,11 +987,6 @@ static const VMStateDescription vmstate_virtio_gpu_scanouts = {
}, },
}; };
static const VMStateDescription vmstate_virtio_gpu_unmigratable = {
.name = "virtio-gpu-with-virgl",
.unmigratable = 1,
};
static void virtio_gpu_save(QEMUFile *f, void *opaque) static void virtio_gpu_save(QEMUFile *f, void *opaque)
{ {
VirtIOGPU *g = opaque; VirtIOGPU *g = opaque;
@ -1169,13 +1165,23 @@ static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp)
} }
if (virtio_gpu_virgl_enabled(g->conf)) { if (virtio_gpu_virgl_enabled(g->conf)) {
vmstate_register(qdev, -1, &vmstate_virtio_gpu_unmigratable, g); error_setg(&g->migration_blocker, "virgl is not yet migratable");
migrate_add_blocker(g->migration_blocker);
} else { } else {
register_savevm(qdev, "virtio-gpu", -1, VIRTIO_GPU_VM_VERSION, register_savevm(qdev, "virtio-gpu", -1, VIRTIO_GPU_VM_VERSION,
virtio_gpu_save, virtio_gpu_load, g); virtio_gpu_save, virtio_gpu_load, g);
} }
} }
static void virtio_gpu_device_unrealize(DeviceState *qdev, Error **errp)
{
VirtIOGPU *g = VIRTIO_GPU(qdev);
if (g->migration_blocker) {
migrate_del_blocker(g->migration_blocker);
error_free(g->migration_blocker);
}
}
static void virtio_gpu_instance_init(Object *obj) static void virtio_gpu_instance_init(Object *obj)
{ {
} }
@ -1237,6 +1243,7 @@ static void virtio_gpu_class_init(ObjectClass *klass, void *data)
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
vdc->realize = virtio_gpu_device_realize; vdc->realize = virtio_gpu_device_realize;
vdc->unrealize = virtio_gpu_device_unrealize;
vdc->get_config = virtio_gpu_get_config; vdc->get_config = virtio_gpu_get_config;
vdc->set_config = virtio_gpu_set_config; vdc->set_config = virtio_gpu_set_config;
vdc->get_features = virtio_gpu_get_features; vdc->get_features = virtio_gpu_get_features;

2
include/hw/virtio/virtio-gpu.h
View File

@ -118,6 +118,8 @@ typedef struct VirtIOGPU {
uint32_t req_3d; uint32_t req_3d;
uint32_t bytes_3d; uint32_t bytes_3d;
} stats; } stats;
Error *migration_blocker;
} VirtIOGPU; } VirtIOGPU;
extern const GraphicHwOps virtio_gpu_ops; extern const GraphicHwOps virtio_gpu_ops;