[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 50/55] virtio-serial: Wrap in vmstate
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v3 50/55] virtio-serial: Wrap in vmstate |
Date: |
Wed, 20 Jul 2016 20:49:12 +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/char/virtio-serial-bus.c | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 490b5ea..db57a38 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -594,12 +594,6 @@ static void vser_reset(VirtIODevice *vdev)
guest_reset(vser);
}
-static void virtio_serial_save(QEMUFile *f, void *opaque)
-{
- /* The virtio device */
- virtio_save(VIRTIO_DEVICE(opaque), f);
-}
-
static void virtio_serial_save_device(VirtIODevice *vdev, QEMUFile *f)
{
VirtIOSerial *s = VIRTIO_SERIAL(vdev);
@@ -734,14 +728,10 @@ static int fetch_active_ports_list(QEMUFile *f,
return 0;
}
-static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id)
+static int virtio_serial_load(QEMUFile *f, void *opaque, size_t size)
{
- if (version_id != 3) {
- return -EINVAL;
- }
-
/* The virtio device */
- return virtio_load(VIRTIO_DEVICE(opaque), f, version_id);
+ return virtio_load(VIRTIO_DEVICE(opaque), f, 3);
}
static int virtio_serial_load_device(VirtIODevice *vdev, QEMUFile *f,
@@ -1042,13 +1032,6 @@ static void virtio_serial_device_realize(DeviceState
*dev, Error **errp)
vser->post_load = NULL;
- /*
- * Register for the savevm section with the virtio-console name
- * to preserve backward compat
- */
- register_savevm(dev, "virtio-console", -1, 3, virtio_serial_save,
- virtio_serial_load, vser);
-
QLIST_INSERT_HEAD(&vserdevices.devices, vser, next);
}
@@ -1079,8 +1062,6 @@ static void virtio_serial_device_unrealize(DeviceState
*dev, Error **errp)
QLIST_REMOVE(vser, next);
- unregister_savevm(dev, "virtio-console", vser);
-
g_free(vser->ivqs);
g_free(vser->ovqs);
g_free(vser->ports_map);
@@ -1093,6 +1074,9 @@ static void virtio_serial_device_unrealize(DeviceState
*dev, Error **errp)
virtio_cleanup(vdev);
}
+/* Note: 'console' is used for backwards compatibility */
+VMSTATE_VIRTIO_DEVICE(console, 3, virtio_serial_load, virtio_vmstate_save);
+
static Property virtio_serial_properties[] = {
DEFINE_PROP_UINT32("max_ports", VirtIOSerial, serial.max_virtserial_ports,
31),
@@ -1108,6 +1092,7 @@ static void virtio_serial_class_init(ObjectClass *klass,
void *data)
QLIST_INIT(&vserdevices.devices);
dc->props = virtio_serial_properties;
+ dc->vmsd = &vmstate_virtio_console;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
vdc->realize = virtio_serial_device_realize;
vdc->unrealize = virtio_serial_device_unrealize;
--
MST
- [Qemu-devel] [PULL v3 41/55] virtio-scsi: Replace HandleOutput typedef, (continued)
- [Qemu-devel] [PULL v3 41/55] virtio-scsi: Replace HandleOutput typedef, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 40/55] Revert "mirror: Workaround for unexpected iohandler events during completion", Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 42/55] virtio-net: Remove old migration version support, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 43/55] virtio-serial: Remove old migration version support, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 44/55] virtio: Migration helper function and macro, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 45/55] virtio-scsi: Wrap in vmstate, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 47/55] virtio-rng: Wrap in vmstate, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 46/55] virtio-blk: Wrap in vmstate, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 48/55] virtio-balloon: Wrap in vmstate, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 49/55] virtio-net: Wrap in vmstate, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 50/55] virtio-serial: Wrap in vmstate,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v3 51/55] 9pfs: Wrap in vmstate, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 52/55] virtio-input: Wrap in vmstate, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 53/55] virtio-gpu: Use migrate_add_blocker for virgl migration blocking, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 54/55] virtio-gpu: Wrap in vmstate, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 55/55] virtio: Update migration docs, Michael S. Tsirkin, 2016/07/20
- Re: [Qemu-devel] [PULL v3 00/55] pc, pci, virtio: new features, cleanups, fixes, Peter Maydell, 2016/07/21
- Re: [Qemu-devel] [PULL v3 00/55] pc, pci, virtio: new features, cleanups, fixes, Peter Xu, 2016/07/21
- Re: [Qemu-devel] [PULL v3 00/55] pc, pci, virtio: new features, cleanups, fixes, Peter Maydell, 2016/07/21
- Re: [Qemu-devel] [PULL v3 00/55] pc, pci, virtio: new features, cleanups, fixes, Fam Zheng, 2016/07/21
- Re: [Qemu-devel] [PULL v3 00/55] pc, pci, virtio: new features, cleanups, fixes, Peter Maydell, 2016/07/22