aboutsummaryrefslogtreecommitdiff
path: root/savevm.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-04-15 08:02:41 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-15 08:02:41 -0500
commitdb08dc213ba87d16c34c235f5c83f70f0239f023 (patch)
tree75729e2695511f7ef73cf9cf9fc4b2b6206c2f2e /savevm.c
parentc530b1423b86f1589c49bccb460a75cb87322562 (diff)
parentdc7588c1eb3008bda53dde1d6b890cd299758155 (diff)
downloadqemu-arm-db08dc213ba87d16c34c235f5c83f70f0239f023.tar.gz
Merge remote-tracking branch 'stefanha/block' into staging
* stefanha/block: rbd: add an asynchronous flush iotests: Add 'check -ssh' option to test Secure Shell block device. block: ssh: Use libssh2_sftp_fsync (if supported by libssh2) to flush to disk. block: Add support for Secure Shell (ssh) block device. ide: refuse WIN_READ_NATIVE_MAX on empty device qemu-iotests: filter QEMU_PROG in 051.out qemu-iotests: Add test for -drive options qemu-iotests: A few more bdrv_pread/pwrite tests block: Introduce bdrv_pwritev() for qcow2_save_vmstate savevm: Implement block_writev_buffer() block: Introduce bdrv_writev_vmstate Conflicts: savevm.c aliguori: add f->pos parameter to writev_buffer(). Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'savevm.c')
-rw-r--r--savevm.c25
1 files changed, 21 insertions, 4 deletions
diff --git a/savevm.c b/savevm.c
index 63f4c828a9..53515cb794 100644
--- a/savevm.c
+++ b/savevm.c
@@ -175,7 +175,8 @@ static void coroutine_fn yield_until_fd_readable(int fd)
qemu_coroutine_yield();
}
-static ssize_t socket_writev_buffer(void *opaque, struct iovec *iov, int iovcnt)
+static ssize_t socket_writev_buffer(void *opaque, struct iovec *iov, int iovcnt,
+ int64_t pos)
{
QEMUFileSocket *s = opaque;
ssize_t len;
@@ -457,6 +458,21 @@ fail:
return NULL;
}
+static ssize_t block_writev_buffer(void *opaque, struct iovec *iov, int iovcnt,
+ int64_t pos)
+{
+ int ret;
+ QEMUIOVector qiov;
+
+ qemu_iovec_init_external(&qiov, iov, iovcnt);
+ ret = bdrv_writev_vmstate(opaque, &qiov, pos);
+ if (ret < 0) {
+ return ret;
+ }
+
+ return qiov.size;
+}
+
static int block_put_buffer(void *opaque, const uint8_t *buf,
int64_t pos, int size)
{
@@ -480,8 +496,9 @@ static const QEMUFileOps bdrv_read_ops = {
};
static const QEMUFileOps bdrv_write_ops = {
- .put_buffer = block_put_buffer,
- .close = bdrv_fclose
+ .put_buffer = block_put_buffer,
+ .writev_buffer = block_writev_buffer,
+ .close = bdrv_fclose
};
static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int is_writable)
@@ -535,7 +552,7 @@ static void qemu_fflush(QEMUFile *f)
if (f->ops->writev_buffer) {
if (f->iovcnt > 0) {
- ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt);
+ ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt, f->pos);
}
} else {
if (f->buf_index > 0) {