ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-balloon: Wrap in vmstate 

Forcibly convert it to a vmstate wrapper;  proper conversion
comes later.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2016-07-14 18:22:49 +01:00 committed by Michael S. Tsirkin
parent b607579386
commit 7f1ca9b23b
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/virtio/virtio-balloon.c
View File

@ -396,11 +396,6 @@ static void virtio_balloon_to_target(void *opaque, ram_addr_t target)
trace_virtio_balloon_to_target(target, dev->num_pages); trace_virtio_balloon_to_target(target, dev->num_pages);
} }
static void virtio_balloon_save(QEMUFile *f, void *opaque)
{
virtio_save(VIRTIO_DEVICE(opaque), f);
}
static void virtio_balloon_save_device(VirtIODevice *vdev, QEMUFile *f) static void virtio_balloon_save_device(VirtIODevice *vdev, QEMUFile *f)
{ {
VirtIOBalloon *s = VIRTIO_BALLOON(vdev); VirtIOBalloon *s = VIRTIO_BALLOON(vdev);
@ -409,12 +404,9 @@ static void virtio_balloon_save_device(VirtIODevice *vdev, QEMUFile *f)
qemu_put_be32(f, s->actual); qemu_put_be32(f, s->actual);
} }
static int virtio_balloon_load(QEMUFile *f, void *opaque, int version_id) static int virtio_balloon_load(QEMUFile *f, void *opaque, size_t size)
{ {
if (version_id != 1) return virtio_load(VIRTIO_DEVICE(opaque), f, 1);
return -EINVAL;
return virtio_load(VIRTIO_DEVICE(opaque), f, version_id);
} }
static int virtio_balloon_load_device(VirtIODevice *vdev, QEMUFile *f, static int virtio_balloon_load_device(VirtIODevice *vdev, QEMUFile *f,
@ -454,9 +446,6 @@ static void virtio_balloon_device_realize(DeviceState *dev, Error **errp)
s->svq = virtio_add_queue(vdev, 128, virtio_balloon_receive_stats); s->svq = virtio_add_queue(vdev, 128, virtio_balloon_receive_stats);
reset_stats(s); reset_stats(s);
register_savevm(dev, "virtio-balloon", -1, 1,
virtio_balloon_save, virtio_balloon_load, s);
} }
static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp) static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp)
@ -466,7 +455,6 @@ static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp)
balloon_stats_destroy_timer(s); balloon_stats_destroy_timer(s);
qemu_remove_balloon_handler(s); qemu_remove_balloon_handler(s);
unregister_savevm(dev, "virtio-balloon", s);
virtio_cleanup(vdev); virtio_cleanup(vdev);
} }
@ -493,6 +481,8 @@ static void virtio_balloon_instance_init(Object *obj)
NULL, s, NULL); NULL, s, NULL);
} }
VMSTATE_VIRTIO_DEVICE(balloon, 1, virtio_balloon_load, virtio_vmstate_save);
static Property virtio_balloon_properties[] = { static Property virtio_balloon_properties[] = {
DEFINE_PROP_BIT("deflate-on-oom", VirtIOBalloon, host_features, DEFINE_PROP_BIT("deflate-on-oom", VirtIOBalloon, host_features,
VIRTIO_BALLOON_F_DEFLATE_ON_OOM, false), VIRTIO_BALLOON_F_DEFLATE_ON_OOM, false),
@ -505,6 +495,7 @@ static void virtio_balloon_class_init(ObjectClass *klass, void *data)
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
dc->props = virtio_balloon_properties; dc->props = virtio_balloon_properties;
dc->vmsd = &vmstate_virtio_balloon;
set_bit(DEVICE_CATEGORY_MISC, dc->categories); set_bit(DEVICE_CATEGORY_MISC, dc->categories);
vdc->realize = virtio_balloon_device_realize; vdc->realize = virtio_balloon_device_realize;
vdc->unrealize = virtio_balloon_device_unrealize; vdc->unrealize = virtio_balloon_device_unrealize;