diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/virtio-gpu.c | 4 | ||||
| -rw-r--r-- | hw/virtio/virtio.c | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 6b5f119..43bbe09 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1050,9 +1050,7 @@ static int virtio_gpu_save(QEMUFile *f, void *opaque, size_t size, } qemu_put_be32(f, 0); /* end of list */ - vmstate_save_state(f, &vmstate_virtio_gpu_scanouts, g, NULL); - - return 0; + return vmstate_save_state(f, &vmstate_virtio_gpu_scanouts, g, NULL); } static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size, diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 3129d25..311929e 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1897,7 +1897,7 @@ static const VMStateDescription vmstate_virtio = { } }; -void virtio_save(VirtIODevice *vdev, QEMUFile *f) +int virtio_save(VirtIODevice *vdev, QEMUFile *f) { BusState *qbus = qdev_get_parent_bus(DEVICE(vdev)); VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus); @@ -1947,20 +1947,21 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) } if (vdc->vmsd) { - vmstate_save_state(f, vdc->vmsd, vdev, NULL); + int ret = vmstate_save_state(f, vdc->vmsd, vdev, NULL); + if (ret) { + return ret; + } } /* Subsections */ - vmstate_save_state(f, &vmstate_virtio, vdev, NULL); + return vmstate_save_state(f, &vmstate_virtio, vdev, NULL); } /* A wrapper for use as a VMState .put function */ static int virtio_device_put(QEMUFile *f, void *opaque, size_t size, VMStateField *field, QJSON *vmdesc) { - virtio_save(VIRTIO_DEVICE(opaque), f); - - return 0; + return virtio_save(VIRTIO_DEVICE(opaque), f); } /* A wrapper for use as a VMState .get function */ |