mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-rng: convert VMSTATE_VIRTIO_DEVICE

Browse Source 
Use the new VMSTATE_VIRTIO_DEVICE macro.

Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Halil Pasic 2016-10-06 14:55:48 +02:00 committed by Michael S. Tsirkin
parent c5dc16b726
commit b7de81f697
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/virtio/virtio-rng.c
View File

@ -9,6 +9,8 @@
* top-level directory. * top-level directory.
*/ */
#define VMSTATE_VIRTIO_DEVICE_USE_NEW
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/iov.h" #include "qemu/iov.h"
@ -120,15 +122,9 @@ static uint64_t get_features(VirtIODevice *vdev, uint64_t f, Error **errp)
return f; 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; 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 /* 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 * 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); 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[] = { static Property virtio_rng_properties[] = {
/* Set a default rate limit of 2^47 bytes per minute or roughly 2TB/s. If /* Set a default rate limit of 2^47 bytes per minute or roughly 2TB/s. If