diff options
author | Michael Tokarev <mjt@tls.msk.ru> | 2013-01-17 18:47:52 +0400 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-01-18 09:57:51 +0100 |
commit | 3249dbe661ba6ef108ecde97c54b4a4104d719c3 (patch) | |
tree | 00fc52fd1ff2c75f3994c4bb6c522bf2528de145 /block/win32-aio.c | |
parent | e8bccad5ac6095b5af7946cd72d9aacb57f7c0a3 (diff) | |
download | qemu-3249dbe661ba6ef108ecde97c54b4a4104d719c3.zip qemu-3249dbe661ba6ef108ecde97c54b4a4104d719c3.tar.gz qemu-3249dbe661ba6ef108ecde97c54b4a4104d719c3.tar.bz2 |
win32-aio: use iov utility functions instead of open-coding them
We have iov_from_buf() and iov_to_buf(), use them instead of
open-coding these in block/win32-aio.c
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block/win32-aio.c')
-rw-r--r-- | block/win32-aio.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/block/win32-aio.c b/block/win32-aio.c index b9236ea..5d0fbbf 100644 --- a/block/win32-aio.c +++ b/block/win32-aio.c @@ -29,6 +29,7 @@ #include "block/aio.h" #include "raw-aio.h" #include "qemu/event_notifier.h" +#include "qemu/iov.h" #include <windows.h> #include <winioctl.h> @@ -80,13 +81,7 @@ static void win32_aio_process_completion(QEMUWin32AIOState *s, if (!waiocb->is_linear) { if (ret == 0 && waiocb->is_read) { QEMUIOVector *qiov = waiocb->qiov; - char *p = waiocb->buf; - int i; - - for (i = 0; i < qiov->niov; ++i) { - memcpy(qiov->iov[i].iov_base, p, qiov->iov[i].iov_len); - p += qiov->iov[i].iov_len; - } + iov_from_buf(qiov->iov, qiov->niov, 0, waiocb->buf, qiov->size); } qemu_vfree(waiocb->buf); } @@ -153,13 +148,7 @@ BlockDriverAIOCB *win32_aio_submit(BlockDriverState *bs, if (qiov->niov > 1) { waiocb->buf = qemu_blockalign(bs, qiov->size); if (type & QEMU_AIO_WRITE) { - char *p = waiocb->buf; - int i; - - for (i = 0; i < qiov->niov; ++i) { - memcpy(p, qiov->iov[i].iov_base, qiov->iov[i].iov_len); - p += qiov->iov[i].iov_len; - } + iov_to_buf(qiov->iov, qiov->niov, 0, waiocb->buf, qiov->size); } waiocb->is_linear = false; } else { |