[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 47/55] virtio-rng: Wrap in vmstate
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 47/55] virtio-rng: Wrap in vmstate |
Date: |
Tue, 19 Jul 2016 20:55:12 +0300 |
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>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/virtio-rng.c | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index 6b991a7..cd8ca10 100644
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -120,22 +120,12 @@ static uint64_t get_features(VirtIODevice *vdev, uint64_t
f, Error **errp)
return f;
}
-static void virtio_rng_save(QEMUFile *f, void *opaque)
-{
- VirtIODevice *vdev = opaque;
-
- virtio_save(vdev, f);
-}
-
-static int virtio_rng_load(QEMUFile *f, void *opaque, int version_id)
+static int virtio_rng_load(QEMUFile *f, void *opaque, size_t size)
{
VirtIORNG *vrng = opaque;
int ret;
- if (version_id != 1) {
- return -EINVAL;
- }
- ret = virtio_load(VIRTIO_DEVICE(vrng), f, version_id);
+ ret = virtio_load(VIRTIO_DEVICE(vrng), f, 1);
if (ret != 0) {
return ret;
}
@@ -214,8 +204,6 @@ static void virtio_rng_device_realize(DeviceState *dev,
Error **errp)
vrng->rate_limit_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL,
check_rate_limit, vrng);
vrng->activate_timer = true;
- register_savevm(dev, "virtio-rng", -1, 1, virtio_rng_save,
- virtio_rng_load, vrng);
}
static void virtio_rng_device_unrealize(DeviceState *dev, Error **errp)
@@ -225,10 +213,11 @@ static void virtio_rng_device_unrealize(DeviceState *dev,
Error **errp)
timer_del(vrng->rate_limit_timer);
timer_free(vrng->rate_limit_timer);
- unregister_savevm(dev, "virtio-rng", vrng);
virtio_cleanup(vdev);
}
+VMSTATE_VIRTIO_DEVICE(rng, 1, virtio_rng_load, virtio_vmstate_save);
+
static Property virtio_rng_properties[] = {
/* Set a default rate limit of 2^47 bytes per minute or roughly 2TB/s. If
* you have an entropy source capable of generating more entropy than this
@@ -246,6 +235,7 @@ static void virtio_rng_class_init(ObjectClass *klass, void
*data)
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
dc->props = virtio_rng_properties;
+ dc->vmsd = &vmstate_virtio_rng;
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
vdc->realize = virtio_rng_device_realize;
vdc->unrealize = virtio_rng_device_unrealize;
--
MST
- [Qemu-devel] [PULL v2 36/55] virtio: Add typedef for handle_output, (continued)
- [Qemu-devel] [PULL v2 36/55] virtio: Add typedef for handle_output, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 37/55] virtio: Introduce virtio_add_queue_aio, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 38/55] virtio-blk: Call virtio_add_queue_aio, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 39/55] virtio-scsi: Call virtio_add_queue_aio, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 40/55] Revert "mirror: Workaround for unexpected iohandler events during completion", Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 41/55] virtio-scsi: Replace HandleOutput typedef, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 42/55] virtio-net: Remove old migration version support, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 43/55] virtio-serial: Remove old migration version support, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 44/55] virtio: Migration helper function and macro, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 45/55] virtio-scsi: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 47/55] virtio-rng: Wrap in vmstate,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 46/55] virtio-blk: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 48/55] virtio-balloon: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 49/55] virtio-net: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 50/55] virtio-serial: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 51/55] 9pfs: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 52/55] virtio-input: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 53/55] virtio-gpu: Use migrate_add_blocker for virgl migration blocking, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 54/55] virtio-gpu: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 55/55] virtio: Update migration docs, Michael S. Tsirkin, 2016/07/19
- Re: [Qemu-devel] [PULL v2 00/55] pc, pci, virtio: new features, cleanups, fixes, Peter Maydell, 2016/07/20