From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPAHA-0007Tm-2Z for qemu-devel@nongnu.org; Mon, 08 Apr 2013 07:30:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPAH4-0006cT-6B for qemu-devel@nongnu.org; Mon, 08 Apr 2013 07:30:16 -0400 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]:58930) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPAH4-0006cL-0A for qemu-devel@nongnu.org; Mon, 08 Apr 2013 07:30:10 -0400 Received: by mail-wi0-f181.google.com with SMTP id hj8so2426905wib.2 for ; Mon, 08 Apr 2013 04:30:09 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 8 Apr 2013 13:29:57 +0200 Message-Id: <1365420597-5506-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1365420597-5506-1-git-send-email-pbonzini@redhat.com> References: <1365420597-5506-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] migration: simplify writev vs. non-writev logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, owasserm@redhat.com, quintela@redhat.com Check f->iovcnt in add_to_iovec, f->buf_index in qemu_put_buffer/byte. Signed-off-by: Paolo Bonzini --- savevm.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/savevm.c b/savevm.c index a2f6bc0..63f4c82 100644 --- a/savevm.c +++ b/savevm.c @@ -626,7 +626,7 @@ static void add_to_iovec(QEMUFile *f, const uint8_t *buf, int size) f->iov[f->iovcnt++].iov_len = size; } - if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) { + if (f->iovcnt >= MAX_IOV_SIZE) { qemu_fflush(f); } } @@ -662,12 +662,10 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size) f->bytes_xfer += size; if (f->ops->writev_buffer) { add_to_iovec(f, f->buf + f->buf_index, l); - f->buf_index += l; - } else { - f->buf_index += l; - if (f->buf_index == IO_BUF_SIZE) { - qemu_fflush(f); - } + } + f->buf_index += l; + if (f->buf_index == IO_BUF_SIZE) { + qemu_fflush(f); } if (qemu_file_get_error(f)) { break; @@ -687,12 +685,10 @@ void qemu_put_byte(QEMUFile *f, int v) f->bytes_xfer++; if (f->ops->writev_buffer) { add_to_iovec(f, f->buf + f->buf_index, 1); - f->buf_index++; - } else { - f->buf_index++; - if (f->buf_index == IO_BUF_SIZE) { - qemu_fflush(f); - } + } + f->buf_index++; + if (f->buf_index == IO_BUF_SIZE) { + qemu_fflush(f); } } -- 1.8.2