[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] win32-aio: use iov utility functions instead of
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 6/8] win32-aio: use iov utility functions instead of open-coding them |
Date: |
Fri, 18 Jan 2013 17:28:39 +0100 |
From: Michael Tokarev <address@hidden>
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 <address@hidden>
---
block/win32-aio.c | 17 +++--------------
1 file 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 {
--
1.8.0.2
- [Qemu-devel] [PULL for-1.4 0/8] Block patches, Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 2/8] ide: Remove wrong assertion, Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 1/8] block: fix null-pointer bug on error case in block commit, Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 4/8] win32-aio: Fix vectored reads, Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 5/8] win32-aio: Fix memory leak, Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 6/8] win32-aio: use iov utility functions instead of open-coding them,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 3/8] aio: Fix return value of aio_poll(), Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 7/8] dataplane: avoid reentrancy during virtio_blk_data_plane_stop(), Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 8/8] dataplane: support viostor virtio-pci status bit setting, Stefan Hajnoczi, 2013/01/18
- Re: [Qemu-devel] [PULL for-1.4 0/8] Block patches, Anthony Liguori, 2013/01/20