From patchwork Fri Mar 22 14:48:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 230079 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A4E4D2C008A for ; Sat, 23 Mar 2013 01:51:19 +1100 (EST) Received: from localhost ([::1]:33353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ3JN-0003fL-VL for incoming@patchwork.ozlabs.org; Fri, 22 Mar 2013 10:51:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ3FU-0006HD-6i for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:47:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ3FR-0007jT-KV for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:47:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ3FR-0007jI-BD for qemu-devel@nongnu.org; Fri, 22 Mar 2013 10:47:13 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2MElBxg008061 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 22 Mar 2013 10:47:12 -0400 Received: from dhcp-1-120.tlv.redhat.com (vpn-200-53.tlv.redhat.com [10.35.200.53]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2MEkuko010401; Fri, 22 Mar 2013 10:47:09 -0400 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Fri, 22 Mar 2013 16:48:01 +0200 Message-Id: <1363963683-26157-6-git-send-email-owasserm@redhat.com> In-Reply-To: <1363963683-26157-1-git-send-email-owasserm@redhat.com> References: <1363963683-26157-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: mst@redhat.com, quintela@redhat.com, Orit Wasserman , pbonzini@redhat.com, chegu_vinod@hp.com Subject: [Qemu-devel] [PATCH v5 5/7] Use writev ops if available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Update qemu_fflush and stdio_close to use writev ops if they are available Use the buffers stored in the iovec. Signed-off-by: Orit Wasserman Reviewed-by: Juan Quintela --- savevm.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/savevm.c b/savevm.c index 8dad9ef..294434b 100644 --- a/savevm.c +++ b/savevm.c @@ -293,7 +293,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; @@ -516,20 +516,35 @@ 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; + ssize_t ret = 0; + int i = 0; - if (!f->ops->put_buffer) { + if (!f->ops->writev_buffer && !f->ops->put_buffer) { 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; + + if (f->is_write && f->iovcnt > 0) { + if (f->ops->writev_buffer) { + ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt); + if (ret >= 0) { + f->pos += ret; + } + } else { + for (i = 0; i < f->iovcnt && ret >= 0; i++) { + ret = f->ops->put_buffer(f->opaque, f->iov[i].iov_base, f->pos, + f->iov[i].iov_len); + if (ret >= 0) { + f->pos += ret; + } + } } f->buf_index = 0; f->iovcnt = 0;