From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIhz8-000177-04 for qemu-devel@nongnu.org; Thu, 21 Mar 2013 12:04:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIhz5-0005Gk-2H for qemu-devel@nongnu.org; Thu, 21 Mar 2013 12:04:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46456) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIhz4-0005Ga-LV for qemu-devel@nongnu.org; Thu, 21 Mar 2013 12:04:54 -0400 From: Orit Wasserman Date: Thu, 21 Mar 2013 18:05:35 +0200 Message-Id: <1363881940-27505-5-git-send-email-owasserm@redhat.com> In-Reply-To: <1363881940-27505-1-git-send-email-owasserm@redhat.com> References: <1363881940-27505-1-git-send-email-owasserm@redhat.com> Subject: [Qemu-devel] [PATCH v3 4/9] Store the data to send also in iovec List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Orit Wasserman , pbonzini@redhat.com, mst@redhat.com, chegu_vinod@hp.com, quintela@redhat.com All data is still copied into the static buffer. Signed-off-by: Orit Wasserman --- 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