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

virtio-input: 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:45 +02:00 committed by Michael S. Tsirkin
parent 8a502efd0c
commit 73a17349ff
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/input/virtio-input.c
View File

@ -4,6 +4,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"
@ -217,19 +219,12 @@ static void virtio_input_reset(VirtIODevice *vdev)
} }
} }
static int virtio_input_load(QEMUFile *f, void *opaque, size_t size) static int virtio_input_post_load(void *opaque, int version_id)
{ {
VirtIOInput *vinput = opaque; VirtIOInput *vinput = opaque;
VirtIOInputClass *vic = VIRTIO_INPUT_GET_CLASS(vinput); VirtIOInputClass *vic = VIRTIO_INPUT_GET_CLASS(vinput);
VirtIODevice *vdev = VIRTIO_DEVICE(vinput); VirtIODevice *vdev = VIRTIO_DEVICE(vinput);
int ret;
ret = virtio_load(vdev, f, VIRTIO_INPUT_VM_VERSION);
if (ret) {
return ret;
}
/* post_load() */
vinput->active = vdev->status & VIRTIO_CONFIG_S_DRIVER_OK; vinput->active = vdev->status & VIRTIO_CONFIG_S_DRIVER_OK;
if (vic->change_active) { if (vic->change_active) {
vic->change_active(vinput); vic->change_active(vinput);
@ -296,8 +291,16 @@ static void virtio_input_device_unrealize(DeviceState *dev, Error **errp)
virtio_cleanup(vdev); virtio_cleanup(vdev);
} }
VMSTATE_VIRTIO_DEVICE(input, VIRTIO_INPUT_VM_VERSION, virtio_input_load, static const VMStateDescription vmstate_virtio_input = {
virtio_vmstate_save); .name = "virtio-input",
.minimum_version_id = VIRTIO_INPUT_VM_VERSION,
.version_id = VIRTIO_INPUT_VM_VERSION,
.fields = (VMStateField[]) {
VMSTATE_VIRTIO_DEVICE,
VMSTATE_END_OF_LIST()
},
.post_load = virtio_input_post_load,
};
static Property virtio_input_properties[] = { static Property virtio_input_properties[] = {
DEFINE_PROP_STRING("serial", VirtIOInput, serial), DEFINE_PROP_STRING("serial", VirtIOInput, serial),