From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPWn0-0005M9-AB for qemu-devel@nongnu.org; Tue, 09 Apr 2013 07:32:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPWmz-0003AR-47 for qemu-devel@nongnu.org; Tue, 09 Apr 2013 07:32:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPWmy-0003AK-SI for qemu-devel@nongnu.org; Tue, 09 Apr 2013 07:32:37 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r39BWaZC026713 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 9 Apr 2013 07:32:36 -0400 From: Juan Quintela In-Reply-To: <1365420597-5506-2-git-send-email-pbonzini@redhat.com> (Paolo Bonzini's message of "Mon, 8 Apr 2013 13:29:54 +0200") References: <1365420597-5506-1-git-send-email-pbonzini@redhat.com> <1365420597-5506-2-git-send-email-pbonzini@redhat.com> Date: Tue, 09 Apr 2013 13:32:42 +0200 Message-ID: <87hajgdjmt.fsf@elfo.elfo> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 1/4] migration: set f->is_write and flush in add_to_iovec Reply-To: quintela@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: kwolf@redhat.com, owasserm@redhat.com, qemu-devel@nongnu.org Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini > --- > savevm.c | 25 +++++++++---------------- > 1 file changed, 9 insertions(+), 16 deletions(-) > > diff --git a/savevm.c b/savevm.c > index b1d8988..c952c41 100644 > --- a/savevm.c > +++ b/savevm.c > @@ -631,6 +631,11 @@ static void add_to_iovec(QEMUFile *f, const uint8_t *buf, int size) > f->iov[f->iovcnt].iov_base = (uint8_t *)buf; > f->iov[f->iovcnt++].iov_len = size; > } > + > + f->is_write = 1; > + if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) { > + qemu_fflush(f); > + } > } > > void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size) > @@ -645,14 +650,8 @@ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size) > abort(); > } > > - add_to_iovec(f, buf, size); > - > - f->is_write = 1; > f->bytes_xfer += size; > - > - if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) { > - qemu_fflush(f); > - } > + add_to_iovec(f, buf, size); > } > > void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size) > @@ -674,7 +673,6 @@ 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->is_write = 1; > f->buf_index += l; we increase buf_index > qemu_put_buffer_async(f, f->buf + (f->buf_index - l), l); and we call add_to_iovec() here inside. Notice the torture to get the old buf_index value. > if (qemu_file_get_error(f)) { > @@ -697,15 +695,10 @@ void qemu_put_byte(QEMUFile *f, int v) > abort(); > } > > - f->buf[f->buf_index++] = v; > - f->is_write = 1; > + f->buf[f->buf_index] = v; > f->bytes_xfer++; > - > - add_to_iovec(f, f->buf + (f->buf_index - 1), 1); > - > - if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) { > - qemu_fflush(f); > - } > + add_to_iovec(f, f->buf + f->buf_index, 1); > + f->buf_index++; And here, we call add_to_iovec() and then increase buf_index Is there any good reason for not being consistent? Once there, I think that moving the handling of buf_index to inside add_to_iovec() looks like a good idea? Later, Juan. > } > > static void qemu_file_skip(QEMUFile *f, int size)