Patchwork [v6,3/6] char: Let writers know how much data was written in case of errors

login
register
mail settings
Submitter Amit Shah
Date May 4, 2010, 6:23 p.m.
Message ID <1272997439-9675-4-git-send-email-amit.shah@redhat.com>
Download mbox | patch
Permalink /patch/51660/
State New
Headers show

Comments

Amit Shah - May 4, 2010, 6:23 p.m.
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 <amit.shah@redhat.com>
---
 qemu-char.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

Patch

diff --git a/qemu-char.c b/qemu-char.c
index 65cb3f5..1f5d886 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -507,6 +507,9 @@  int send_all(int fd, const void *buf, int len1)
     while (len > 0) {
         ret = send(fd, buf, len, 0);
         if (ret < 0) {
+            if (len1 - len) {
+                return len1 - len;
+            }
             errno = WSAGetLastError();
             if (errno != WSAEWOULDBLOCK) {
                 return -1;
@@ -531,8 +534,15 @@  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)
+            if (errno == EINTR) {
+                continue;
+            }
+            if (len1 - len) {
+                return len1 - len;
+            }
+            if (errno != EAGAIN) {
                 return -1;
+            }
         } else if (ret == 0) {
             break;
         } else {