diff options
| author | Greg Kurz | 2014-06-24 19:20:23 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2014-06-29 18:39:41 +0200 |
| commit | 3902d49e13c2428bd6381cfdf183103ca4477c1f (patch) | |
| tree | 8d6f7f1c6d962a51b019129e55edb45cd1b79687 /hw/virtio | |
| parent | virtio-balloon: implement per-device migration calls (diff) | |
| download | qemu-3902d49e13c2428bd6381cfdf183103ca4477c1f.tar.gz qemu-3902d49e13c2428bd6381cfdf183103ca4477c1f.tar.xz qemu-3902d49e13c2428bd6381cfdf183103ca4477c1f.zip | |
virtio-rng: implement per-device migration calls
While we are here, we also check virtio_load() return value.
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/virtio')
| -rw-r--r-- | hw/virtio/virtio-rng.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 025de81345..1356aca8d6 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -107,19 +107,20 @@ static void virtio_rng_save(QEMUFile *f, void *opaque) static int virtio_rng_load(QEMUFile *f, void *opaque, int version_id) { - VirtIORNG *vrng = opaque; - VirtIODevice *vdev = VIRTIO_DEVICE(vrng); - if (version_id != 1) { return -EINVAL; } - virtio_load(vdev, f, version_id); + return virtio_load(VIRTIO_DEVICE(opaque), f, version_id); +} +static int virtio_rng_load_device(VirtIODevice *vdev, QEMUFile *f, + int version_id) +{ /* We may have an element ready but couldn't process it due to a quota * limit. Make sure to try again after live migration when the quota may * have been reset. */ - virtio_rng_process(vrng); + virtio_rng_process(VIRTIO_RNG(vdev)); return 0; } @@ -219,6 +220,7 @@ static void virtio_rng_class_init(ObjectClass *klass, void *data) vdc->realize = virtio_rng_device_realize; vdc->unrealize = virtio_rng_device_unrealize; vdc->get_features = get_features; + vdc->load = virtio_rng_load_device; } static void virtio_rng_initfn(Object *obj) |