aboutsummaryrefslogtreecommitdiff
path: root/block/rbd.c
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2012-06-07 20:17:55 +0400
committerMichael Tokarev <mjt@tls.msk.ru>2012-06-11 23:12:11 +0400
commit03396148bca54c0e81ad8eecb12a136456d14c16 (patch)
treeaad331d0a44982f2d0ab7bd5feba8a19d4d046e2 /block/rbd.c
parent3d9b49254f893f2a3739400e536de25db1cdc5f9 (diff)
downloadqemu-03396148bca54c0e81ad8eecb12a136456d14c16.zip
qemu-03396148bca54c0e81ad8eecb12a136456d14c16.tar.gz
qemu-03396148bca54c0e81ad8eecb12a136456d14c16.tar.bz2
allow qemu_iovec_from_buffer() to specify offset from which to start copying
Similar to qemu_iovec_memset(QEMUIOVector *qiov, size_t offset, int c, size_t bytes); the new prototype is: qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset, const void *buf, size_t bytes); The processing starts at offset bytes within qiov. This way, we may copy a bounce buffer directly to a middle of qiov. This is exactly the same function as iov_from_buf() from iov.c, so use the existing implementation and rename it to qemu_iovec_from_buf() to be shorter and to match the utility function. As with utility implementation, we now assert that the offset is inside actual iovec. Nothing changed for current callers, because `offset' parameter is new. While at it, stop using "bounce-qiov" in block/qcow2.c and copy decrypted data directly from cluster_data instead of recreating a temp qiov for doing that. Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'block/rbd.c')
-rw-r--r--block/rbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/rbd.c b/block/rbd.c
index 1280d66..8bb3252 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -620,7 +620,7 @@ static void rbd_aio_bh_cb(void *opaque)
RBDAIOCB *acb = opaque;
if (acb->cmd == RBD_AIO_READ) {
- qemu_iovec_from_buffer(acb->qiov, acb->bounce, acb->qiov->size);
+ qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size);
}
qemu_vfree(acb->bounce);
acb->common.cb(acb->common.opaque, (acb->ret > 0 ? 0 : acb->ret));