[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/9] Use writev ops if available
From: |
Orit Wasserman |
Subject: |
[Qemu-devel] [PATCH v3 5/9] Use writev ops if available |
Date: |
Thu, 21 Mar 2013 18:05:36 +0200 |
Update qemu_fflush and stdio_close to use writev ops if they are available
Use the buffers stored in the iovec.
Signed-off-by: Orit Wasserman <address@hidden>
---
savevm.c | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/savevm.c b/savevm.c
index ab81dd3..f69dce3 100644
--- a/savevm.c
+++ b/savevm.c
@@ -292,7 +292,7 @@ static int stdio_fclose(void *opaque)
QEMUFileStdio *s = opaque;
int ret = 0;
- if (s->file->ops->put_buffer) {
+ if (s->file->ops->put_buffer || s->file->ops->writev_buffer) {
int fd = fileno(s->stdio_file);
struct stat st;
@@ -515,24 +515,40 @@ static void qemu_file_set_error(QEMUFile *f, int ret)
}
}
-/** Flushes QEMUFile buffer
+/**
+ * Flushes QEMUFile buffer
*
+ * If there is writev_buffer QEMUFileOps it uses it otherwise uses
+ * put_buffer ops.
*/
static void qemu_fflush(QEMUFile *f)
{
int ret = 0;
+ int i = 0;
- if (!f->ops->put_buffer) {
+ if (!f->ops->writev_buffer && !f->ops->put_buffer) {
return;
}
- if (f->is_write && f->buf_index > 0) {
- ret = f->ops->put_buffer(f->opaque, f->buf, f->pos, f->buf_index);
- if (ret >= 0) {
- f->pos += f->buf_index;
+
+ if (f->is_write && f->iovcnt > 0) {
+ if (f->ops->writev_buffer) {
+ ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt);
+ if (ret >= 0) {
+ f->pos += ret;
+ }
+ } else {
+ for (i = 0; i < f->iovcnt && ret >= 0; i++) {
+ ret = f->ops->put_buffer(f->opaque, f->iov[i].iov_base, f->pos,
+ f->iov[i].iov_len);
+ if (ret >= 0) {
+ f->pos += ret;
+ }
+ }
}
f->buf_index = 0;
f->iovcnt = 0;
}
+
if (ret < 0) {
qemu_file_set_error(f, ret);
}
--
1.7.11.7
- [Qemu-devel] [PATCH v3 2/9] Add socket_writev_buffer function, (continued)
- [Qemu-devel] [PATCH v3 2/9] Add socket_writev_buffer function, Orit Wasserman, 2013/03/21
- [Qemu-devel] [PATCH v3 1/9] Add QemuFileWritevBuffer QemuFileOps, Orit Wasserman, 2013/03/21
- [Qemu-devel] [PATCH v3 3/9] Update bytes_xfer in qemu_put_byte, Orit Wasserman, 2013/03/21
- [Qemu-devel] [PATCH v3 4/9] Store the data to send also in iovec, Orit Wasserman, 2013/03/21
- [Qemu-devel] [PATCH v3 5/9] Use writev ops if available,
Orit Wasserman <=
- [Qemu-devel] [PATCH v3 6/9] More optimized qemu_put_be64/32/16, Orit Wasserman, 2013/03/21
- [Qemu-devel] [PATCH v3 7/9] Add qemu_put_buffer_no_copy, Orit Wasserman, 2013/03/21
- [Qemu-devel] [PATCH v3 9/9] coalesce adjacent iovecs, Orit Wasserman, 2013/03/21