From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIfSf-0005Sc-1Q for qemu-devel@nongnu.org; Thu, 21 Mar 2013 09:23:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIfSd-0008Do-2J for qemu-devel@nongnu.org; Thu, 21 Mar 2013 09:23:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63656) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIfSc-0008Db-Pz for qemu-devel@nongnu.org; Thu, 21 Mar 2013 09:23:14 -0400 From: Orit Wasserman Date: Thu, 21 Mar 2013 15:23:47 +0200 Message-Id: <1363872230-15081-6-git-send-email-owasserm@redhat.com> In-Reply-To: <1363872230-15081-1-git-send-email-owasserm@redhat.com> References: <1363872230-15081-1-git-send-email-owasserm@redhat.com> Subject: [Qemu-devel] [PATCH v2 5/8] Use writev ops if available 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 Update qemu_fflush and stdio_close to use writev ops if they are available Signed-off-by: Orit Wasserman --- savevm.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/savevm.c b/savevm.c index ab81dd3..fde59d3 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,34 @@ 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; - if (!f->ops->put_buffer) { + if (f->ops->writev_buffer) { + if (f->is_write && f->iovcnt > 0) { + ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt); + } + } else if (f->ops->put_buffer) { + if (f->is_write && f->buf_index > 0) { + ret = f->ops->put_buffer(f->opaque, f->buf, f->pos, f->buf_index); + } + } else { 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; - } - f->buf_index = 0; - f->iovcnt = 0; + + if (ret >= 0) { + f->pos += f->buf_index; } + f->buf_index = 0; + f->iovcnt = 0; + if (ret < 0) { qemu_file_set_error(f, ret); } -- 1.7.11.7