[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/9] Store the data to send also in iovec
From: |
Orit Wasserman |
Subject: |
[Qemu-devel] [PATCH v3 4/9] Store the data to send also in iovec |
Date: |
Thu, 21 Mar 2013 18:05:35 +0200 |
All data is still copied into the static buffer.
Signed-off-by: Orit Wasserman <address@hidden>
---
savevm.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/savevm.c b/savevm.c
index 686c8c8..ab81dd3 100644
--- a/savevm.c
+++ b/savevm.c
@@ -114,6 +114,7 @@ void qemu_announce_self(void)
/* savevm/loadvm support */
#define IO_BUF_SIZE 32768
+#define MAX_IOV_SIZE MIN(IOV_MAX, 64)
struct QEMUFile {
const QEMUFileOps *ops;
@@ -129,6 +130,9 @@ struct QEMUFile {
int buf_size; /* 0 when writing */
uint8_t buf[IO_BUF_SIZE];
+ struct iovec iov[MAX_IOV_SIZE];
+ unsigned int iovcnt;
+
int last_error;
};
@@ -527,6 +531,7 @@ static void qemu_fflush(QEMUFile *f)
f->pos += f->buf_index;
}
f->buf_index = 0;
+ f->iovcnt = 0;
}
if (ret < 0) {
qemu_file_set_error(f, ret);
@@ -619,12 +624,14 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int
size)
if (l > size)
l = size;
memcpy(f->buf + f->buf_index, buf, l);
+ f->iov[f->iovcnt].iov_base = f->buf + f->buf_index;
+ f->iov[f->iovcnt++].iov_len = l;
f->is_write = 1;
f->buf_index += l;
f->bytes_xfer += l;
buf += l;
size -= l;
- if (f->buf_index >= IO_BUF_SIZE) {
+ if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) {
qemu_fflush(f);
if (qemu_file_get_error(f)) {
break;
@@ -648,8 +655,10 @@ void qemu_put_byte(QEMUFile *f, int v)
f->buf[f->buf_index++] = v;
f->is_write = 1;
f->bytes_xfer += 1;
+ f->iov[f->iovcnt].iov_base = f->buf + (f->buf_index - 1);
+ f->iov[f->iovcnt++].iov_len = 1;
- if (f->buf_index >= IO_BUF_SIZE) {
+ if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) {
qemu_fflush(f);
}
}
--
1.7.11.7
- [Qemu-devel] [PATCH v3 0/9] Migration: Remove copying of guest ram pages, Orit Wasserman, 2013/03/21
- [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 <=
- [Qemu-devel] [PATCH v3 5/9] Use writev ops if available, Orit Wasserman, 2013/03/21
- [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