On Thu, 14 Jul 2016 18:22:54 +0100
"Dr. David Alan Gilbert (git)" <dgilb...@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
>
> 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 <dgilb...@redhat.com>
> ---
> hw/display/virtio-gpu.c | 19 +++++++++++++------
> include/hw/virtio/virtio-gpu.h | 2 ++
> 2 files changed, 15 insertions(+), 6 deletions(-)
>
> @@ -1169,13 +1165,23 @@ static void virtio_gpu_device_realize(DeviceState
> *qdev, Error **errp)
> }
>
> 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");
Suggest prepending with "virtio-gpu:".
> + migrate_add_blocker(g->migration_blocker);
> } else {
> register_savevm(qdev, "virtio-gpu", -1, VIRTIO_GPU_VM_VERSION,
> virtio_gpu_save, virtio_gpu_load, g);
> }
> }
In any case,
Reviewed-by: Cornelia Huck <cornelia.h...@de.ibm.com>
