From 44b1ff319c4781c7ab13f7e119b3114a1e6a52e2 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Mon, 25 Sep 2017 12:29:12 +0100 Subject: migration: pre_save return int Modify the pre_save method on VMStateDescription to return an int rather than void so that it potentially can fail. Changed zillions of devices to make them return 0; the only case I've made it return non-0 is hw/intc/s390_flic_kvm.c that already had an error_report/return case. Note: If you add an error exit in your pre_save you must emit an error_report to say why. Signed-off-by: Dr. David Alan Gilbert Message-Id: <20170925112917.21340-2-dgilbert@redhat.com> Reviewed-by: Peter Xu Reviewed-by: Cornelia Huck Reviewed-by: Juan Quintela Signed-off-by: Dr. David Alan Gilbert --- hw/virtio/vhost-vsock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'hw/virtio') diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 49e0022..5ec1c6a 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -254,13 +254,15 @@ static void vhost_vsock_post_load_timer_cb(void *opaque) vhost_vsock_send_transport_reset(vsock); } -static void vhost_vsock_pre_save(void *opaque) +static int vhost_vsock_pre_save(void *opaque) { VHostVSock *vsock = opaque; /* At this point, backend must be stopped, otherwise * it might keep writing to memory. */ assert(!vsock->vhost_dev.started); + + return 0; } static int vhost_vsock_post_load(void *opaque, int version_id) -- cgit v1.1