Skip to content

Commit

Permalink
block: Allow .bdrv_load/save_vmstate() to return 0/-errno
Browse files Browse the repository at this point in the history
The return value of .bdrv_load/save_vmstate() can be any non-negative
number in case of success now. It used to be bytes/-errno.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
  • Loading branch information
kevmw committed Jun 16, 2016
1 parent 5ddda0b commit b433d94
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions block/io.c
Expand Up @@ -1848,9 +1848,16 @@ int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf,
.iov_base = (void *) buf,
.iov_len = size,
};
int ret;

qemu_iovec_init_external(&qiov, &iov, 1);
return bdrv_writev_vmstate(bs, &qiov, pos);

ret = bdrv_writev_vmstate(bs, &qiov, pos);
if (ret < 0) {
return ret;
}

return size;
}

int bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
Expand All @@ -1876,9 +1883,15 @@ int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf,
.iov_base = buf,
.iov_len = size,
};
int ret;

qemu_iovec_init_external(&qiov, &iov, 1);
return bdrv_readv_vmstate(bs, &qiov, pos);
ret = bdrv_readv_vmstate(bs, &qiov, pos);
if (ret < 0) {
return ret;
}

return size;
}

int bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
Expand Down

0 comments on commit b433d94

Please sign in to comment.