From patchwork Thu Mar 21 13:23:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 229673 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 C6B0B2C00C1 for ; Fri, 22 Mar 2013 00:23:54 +1100 (EST) Received: from localhost ([::1]:49329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIfTE-0005hC-3W for incoming@patchwork.ozlabs.org; Thu, 21 Mar 2013 09:23:52 -0400 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 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2LDNBiE007088 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Mar 2013 09:23:11 -0400 Received: from dhcp-1-120.tlv.redhat.com (vpn-200-38.tlv.redhat.com [10.35.200.38]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2LDMtsc017874; Thu, 21 Mar 2013 09:23:09 -0400 From: Orit Wasserman To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Orit Wasserman , pbonzini@redhat.com, mst@redhat.com, chegu_vinod@hp.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH v2 5/8] 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 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); }