[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/12] virtio: prepare change VMSTATE_VIRTIO_DEVI
From: |
Halil Pasic |
Subject: |
[Qemu-devel] [PATCH v2 01/12] virtio: prepare change VMSTATE_VIRTIO_DEVICE macro |
Date: |
Thu, 6 Oct 2016 14:55:39 +0200 |
In most cases the functions passed to VMSTATE_VIRTIO_DEVICE
only call the virtio_load and virtio_save wrappers. Some include some
pre- and post- massaging too. The massaging is better expressed
as such in the VMStateDescription.
Let us prepare for changing the semantic of the VMSTATE_VIRTIO_DEVICE
macro so that it is more similar to the other VMSTATE_*_DEVICE macros
in a sense that it is a field definition.
The preprocessor conditionals are going to be removed as soon as
every usage is converted to the new semantic.
Signed-off-by: Halil Pasic <address@hidden>
---
hw/virtio/virtio.c | 21 +++++++++++++++++++++
include/hw/virtio/virtio.h | 16 ++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 18ce333..2c807dd 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -1622,6 +1622,27 @@ void virtio_vmstate_save(QEMUFile *f, void *opaque,
size_t size)
virtio_save(VIRTIO_DEVICE(opaque), f);
}
+/* A wrapper for use as a VMState .put function */
+static void virtio_device_put(QEMUFile *f, void *opaque, size_t size)
+{
+ virtio_save(VIRTIO_DEVICE(opaque), f);
+}
+
+/* A wrapper for use as a VMState .get function */
+static int virtio_device_get(QEMUFile *f, void *opaque, size_t size)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
+ DeviceClass *dc = DEVICE_CLASS(VIRTIO_DEVICE_GET_CLASS(vdev));
+
+ return virtio_load(vdev, f, dc->vmsd->version_id);
+}
+
+const VMStateInfo virtio_vmstate_info = {
+ .name = "virtio",
+ .get = virtio_device_get,
+ .put = virtio_device_put,
+};
+
static int virtio_set_features_nocheck(VirtIODevice *vdev, uint64_t val)
{
VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 888c8de..db4c125 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -177,6 +177,20 @@ void virtio_notify(VirtIODevice *vdev, VirtQueue *vq);
void virtio_save(VirtIODevice *vdev, QEMUFile *f);
void virtio_vmstate_save(QEMUFile *f, void *opaque, size_t size);
+extern const VMStateInfo virtio_vmstate_info;
+
+#ifdef VMSTATE_VIRTIO_DEVICE_USE_NEW
+
+#define VMSTATE_VIRTIO_DEVICE \
+ { \
+ .name = "virtio", \
+ .info = &virtio_vmstate_info, \
+ .flags = VMS_SINGLE, \
+ }
+
+#else
+/* TODO remove conditional as soon as all users are converted */
+
#define VMSTATE_VIRTIO_DEVICE(devname, v, getf, putf) \
static const VMStateDescription vmstate_virtio_ ## devname = { \
.name = "virtio-" #devname , \
@@ -196,6 +210,8 @@ void virtio_vmstate_save(QEMUFile *f, void *opaque, size_t
size);
} \
}
+#endif
+
int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id);
void virtio_notify_config(VirtIODevice *vdev);
--
2.8.4
- [Qemu-devel] [PATCH v2 00/12] virtio migration: simplify vmstate helper, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 03/12] virtio-net: convert VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 05/12] virtio-serial: convert VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 02/12] virtio-blk: convert VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 06/12] virtio-gpu: convert VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 04/12] virtio-9p: convert VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 01/12] virtio: prepare change VMSTATE_VIRTIO_DEVICE macro,
Halil Pasic <=
- [Qemu-devel] [PATCH v2 10/12] virtio-rng: convert VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 07/12] virtio-input: convert VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 08/12] virtio-scsi: convert VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 11/12] vhost-vsock: convert VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 12/12] virtio: cleanup VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- [Qemu-devel] [PATCH v2 09/12] virtio-balloon: convert VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/10/06
- Re: [Qemu-devel] [PATCH v2 00/12] virtio migration: simplify vmstate helper, Paolo Bonzini, 2016/10/06