From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NzcQN-0004Cs-UV for qemu-devel@nongnu.org; Wed, 07 Apr 2010 17:04:35 -0400 Received: from [140.186.70.92] (port=35145 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzcQM-0004C4-EB for qemu-devel@nongnu.org; Wed, 07 Apr 2010 17:04:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NzcQK-0003Dw-1J for qemu-devel@nongnu.org; Wed, 07 Apr 2010 17:04:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6192) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NzcQJ-0003Ds-Pl for qemu-devel@nongnu.org; Wed, 07 Apr 2010 17:04:32 -0400 From: Amit Shah Date: Thu, 8 Apr 2010 02:32:33 +0530 Message-Id: <1270674156-9345-6-git-send-email-amit.shah@redhat.com> In-Reply-To: <1270674156-9345-5-git-send-email-amit.shah@redhat.com> References: <1270674156-9345-1-git-send-email-amit.shah@redhat.com> <1270674156-9345-2-git-send-email-amit.shah@redhat.com> <1270674156-9345-3-git-send-email-amit.shah@redhat.com> <1270674156-9345-4-git-send-email-amit.shah@redhat.com> <1270674156-9345-5-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH 5/8] char: Let writers know how much data was written in case of errors List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Amit Shah , Paul Brook , "Michael S. Tsirkin" , Gerd Hoffmann , Juan Quintela On writing errors, we just returned -1 even if some bytes were already written out. Ensure we return the number of bytes written before we return the error (on a subsequent call to qemu_chr_write()). Signed-off-by: Amit Shah --- qemu-char.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 048da3f..208466f 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -502,8 +502,13 @@ static int unix_write(int fd, const uint8_t *buf, int len1) while (len > 0) { ret = write(fd, buf, len); if (ret < 0) { - if (errno != EINTR && errno != EAGAIN) - return -1; + if (errno != EINTR && errno != EAGAIN) { + if (len1 - len) { + return len1 - len; + } else { + return -1; + } + } } else if (ret == 0) { break; } else { -- 1.6.2.5