[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/33] virtio-rng: convert VMSTATE_VIRTIO_DEVICE
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 30/33] virtio-rng: convert VMSTATE_VIRTIO_DEVICE |
Date: |
Mon, 10 Oct 2016 05:58:14 +0300 |
From: Halil Pasic <address@hidden>
Use the new VMSTATE_VIRTIO_DEVICE macro.
Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/virtio-rng.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index cd8ca10..62867d1 100644
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -9,6 +9,8 @@
* top-level directory.
*/
+#define VMSTATE_VIRTIO_DEVICE_USE_NEW
+
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/iov.h"
@@ -120,15 +122,9 @@ static uint64_t get_features(VirtIODevice *vdev, uint64_t
f, Error **errp)
return f;
}
-static int virtio_rng_load(QEMUFile *f, void *opaque, size_t size)
+static int virtio_rng_post_load(void *opaque, int version_id)
{
VirtIORNG *vrng = opaque;
- int ret;
-
- ret = virtio_load(VIRTIO_DEVICE(vrng), f, 1);
- if (ret != 0) {
- return ret;
- }
/* 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
@@ -216,7 +212,16 @@ static void virtio_rng_device_unrealize(DeviceState *dev,
Error **errp)
virtio_cleanup(vdev);
}
-VMSTATE_VIRTIO_DEVICE(rng, 1, virtio_rng_load, virtio_vmstate_save);
+static const VMStateDescription vmstate_virtio_rng = {
+ .name = "virtio-rng",
+ .minimum_version_id = 1,
+ .version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_VIRTIO_DEVICE,
+ VMSTATE_END_OF_LIST()
+ },
+ .post_load = virtio_rng_post_load,
+};
static Property virtio_rng_properties[] = {
/* Set a default rate limit of 2^47 bytes per minute or roughly 2TB/s. If
--
MST
- [Qemu-devel] [PULL 29/33] virtio-balloon: convert VMSTATE_VIRTIO_DEVICE, (continued)
- [Qemu-devel] [PULL 29/33] virtio-balloon: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 21/33] virtio: prepare change VMSTATE_VIRTIO_DEVICE macro, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 26/33] virtio-gpu: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 22/33] virtio-blk: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 14/33] virtio-blk: handle virtio_blk_handle_request() errors, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 31/33] vhost-vsock: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 12/33] virtio-blk: make some functions static, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 28/33] virtio-scsi: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 11/33] virtio-9p: add parentheses to sizeof operator, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 25/33] virtio-serial: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 30/33] virtio-rng: convert VMSTATE_VIRTIO_DEVICE,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 33/33] intel-iommu: Check IOAPIC's Trigger Mode against the one in IRTE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 32/33] virtio: cleanup VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- Re: [Qemu-devel] [PULL 00/33] virtio, pc: fixes and features, Peter Maydell, 2016/10/10
- Re: [Qemu-devel] [PULL 00/33] virtio, pc: fixes and features, Peter Maydell, 2016/10/10
- Re: [Qemu-devel] [PULL 00/33] virtio, pc: fixes and features, Michael S. Tsirkin, 2016/10/10
- Re: [Qemu-devel] [PULL 00/33] virtio, pc: fixes and features, Sascha Silbe, 2016/10/11
- Re: [Qemu-devel] [PULL 00/33] virtio, pc: fixes and features, Peter Maydell, 2016/10/11
- Re: [Qemu-devel] [PULL 00/33] virtio, pc: fixes and features, Thomas Huth, 2016/10/11
- Re: [Qemu-devel] [PULL 00/33] virtio, pc: fixes and features, Sascha Silbe, 2016/10/11