[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/13] virtio-gpu: Wrap in vmstate
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH 12/13] virtio-gpu: Wrap in vmstate |
Date: |
Tue, 21 Jun 2016 20:14:06 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
Forcibly convert it to a vmstate wrapper; proper conversion
comes later.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
hw/display/virtio-gpu.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 136c095..52f2e7c 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -985,7 +985,7 @@ static const VMStateDescription
vmstate_virtio_gpu_unmigratable = {
.unmigratable = 1,
};
-static void virtio_gpu_save(QEMUFile *f, void *opaque)
+static void virtio_gpu_save(QEMUFile *f, void *opaque, size_t size)
{
VirtIOGPU *g = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(g);
@@ -1015,7 +1015,7 @@ static void virtio_gpu_save(QEMUFile *f, void *opaque)
vmstate_save_state(f, &vmstate_virtio_gpu_scanouts, g, NULL);
}
-static int virtio_gpu_load(QEMUFile *f, void *opaque, int version_id)
+static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size)
{
VirtIOGPU *g = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(g);
@@ -1024,11 +1024,7 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque,
int version_id)
uint32_t resource_id, pformat;
int i, ret;
- if (version_id != VIRTIO_GPU_VM_VERSION) {
- return -EINVAL;
- }
-
- ret = virtio_load(vdev, f, version_id);
+ ret = virtio_load(vdev, f, VIRTIO_GPU_VM_VERSION);
if (ret) {
return ret;
}
@@ -1164,9 +1160,6 @@ 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);
- } else {
- register_savevm(qdev, "virtio-gpu", -1, VIRTIO_GPU_VM_VERSION,
- virtio_gpu_save, virtio_gpu_load, g);
}
}
@@ -1214,6 +1207,9 @@ static void virtio_gpu_reset(VirtIODevice *vdev)
#endif
}
+VMSTATE_VIRTIO_DEVICE(gpu, VIRTIO_GPU_VM_VERSION, virtio_gpu_load,
+ virtio_gpu_save);
+
static Property virtio_gpu_properties[] = {
DEFINE_PROP_UINT32("max_outputs", VirtIOGPU, conf.max_outputs, 1),
#ifdef CONFIG_VIRGL
@@ -1239,6 +1235,7 @@ static void virtio_gpu_class_init(ObjectClass *klass,
void *data)
vdc->reset = virtio_gpu_reset;
dc->props = virtio_gpu_properties;
+ dc->vmsd = &vmstate_virtio_gpu;
}
static const TypeInfo virtio_gpu_info = {
--
2.7.4
- Re: [Qemu-devel] [PATCH 06/13] virtio-rng: Wrap in vmstate, (continued)
- [Qemu-devel] [PATCH 12/13] virtio-gpu: Wrap in vmstate,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PATCH 13/13] virtio: Update migration docs, Dr. David Alan Gilbert (git), 2016/06/21
- Re: [Qemu-devel] [PATCH 00/13] virtio migration: Flip outer layer to vmstate, Gerd Hoffmann, 2016/06/22
- Re: [Qemu-devel] [PATCH 00/13] virtio migration: Flip outer layer to vmstate, Cornelia Huck, 2016/06/22
- Re: [Qemu-devel] [PATCH 00/13] virtio migration: Flip outer layer to vmstate, Michael S. Tsirkin, 2016/06/24