[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v5 46/57] virtio-scsi: Wrap in vmstate
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v5 46/57] virtio-scsi: Wrap in vmstate |
Date: |
Thu, 21 Jul 2016 20:54:55 +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/scsi/virtio-scsi.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 88d4bf0..ce57ef6 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -663,22 +663,17 @@ static void virtio_scsi_reset(VirtIODevice *vdev)
/* The device does not have anything to save beyond the virtio data.
* Request data is saved with callbacks from SCSI devices.
*/
-static void virtio_scsi_save(QEMUFile *f, void *opaque)
+static void virtio_scsi_save(QEMUFile *f, void *opaque, size_t size)
{
VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
virtio_save(vdev, f);
}
-static int virtio_scsi_load(QEMUFile *f, void *opaque, int version_id)
+static int virtio_scsi_load(QEMUFile *f, void *opaque, size_t size)
{
VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
- int ret;
- ret = virtio_load(vdev, f, version_id);
- if (ret) {
- return ret;
- }
- return 0;
+ return virtio_load(vdev, f, 1);
}
void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
@@ -862,7 +857,6 @@ static void virtio_scsi_device_realize(DeviceState *dev,
Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOSCSI *s = VIRTIO_SCSI(dev);
- static int virtio_scsi_id;
Error *err = NULL;
virtio_scsi_common_realize(dev, &err, virtio_scsi_handle_ctrl,
@@ -885,9 +879,6 @@ static void virtio_scsi_device_realize(DeviceState *dev,
Error **errp)
return;
}
}
-
- register_savevm(dev, "virtio-scsi", virtio_scsi_id++, 1,
- virtio_scsi_save, virtio_scsi_load, s);
}
static void virtio_scsi_instance_init(Object *obj)
@@ -911,9 +902,6 @@ void virtio_scsi_common_unrealize(DeviceState *dev, Error
**errp)
static void virtio_scsi_device_unrealize(DeviceState *dev, Error **errp)
{
- VirtIOSCSI *s = VIRTIO_SCSI(dev);
-
- unregister_savevm(dev, "virtio-scsi", s);
virtio_scsi_common_unrealize(dev, errp);
}
@@ -930,6 +918,8 @@ static Property virtio_scsi_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
+VMSTATE_VIRTIO_DEVICE(scsi, 1, virtio_scsi_load, virtio_scsi_save);
+
static void virtio_scsi_common_class_init(ObjectClass *klass, void *data)
{
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
@@ -946,6 +936,7 @@ static void virtio_scsi_class_init(ObjectClass *klass, void
*data)
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
dc->props = virtio_scsi_properties;
+ dc->vmsd = &vmstate_virtio_scsi;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
vdc->realize = virtio_scsi_device_realize;
vdc->unrealize = virtio_scsi_device_unrealize;
--
MST
- [Qemu-devel] [PULL v5 36/57] intel_iommu: disallow kernel-irqchip=on with IR, (continued)
- [Qemu-devel] [PULL v5 36/57] intel_iommu: disallow kernel-irqchip=on with IR, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 37/57] virtio: Add typedef for handle_output, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 38/57] virtio: Introduce virtio_add_queue_aio, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 39/57] virtio-blk: Call virtio_add_queue_aio, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 40/57] virtio-scsi: Call virtio_add_queue_aio, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 41/57] Revert "mirror: Workaround for unexpected iohandler events during completion", Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 42/57] virtio-scsi: Replace HandleOutput typedef, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 43/57] virtio-net: Remove old migration version support, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 44/57] virtio-serial: Remove old migration version support, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 45/57] virtio: Migration helper function and macro, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 46/57] virtio-scsi: Wrap in vmstate,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v5 48/57] virtio-rng: Wrap in vmstate, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 47/57] virtio-blk: Wrap in vmstate, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 49/57] virtio-balloon: Wrap in vmstate, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 50/57] virtio-net: Wrap in vmstate, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 51/57] virtio-serial: Wrap in vmstate, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 52/57] 9pfs: Wrap in vmstate, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 53/57] virtio-input: Wrap in vmstate, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 55/57] virtio-gpu: Wrap in vmstate, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 54/57] virtio-gpu: Use migrate_add_blocker for virgl migration blocking, Michael S. Tsirkin, 2016/07/21
- [Qemu-devel] [PULL v5 56/57] virtio: Update migration docs, Michael S. Tsirkin, 2016/07/21