Patchwork [v4,1/5] char: Let writers know how much data was written in case of errors

login
register
mail settings
Submitter Amit Shah
Date May 4, 2010, 7:17 a.m.
Message ID <1272957442-7832-2-git-send-email-amit.shah@redhat.com>
Download mbox | patch
Permalink /patch/51569/
State New
Headers show

Comments

Amit Shah - May 4, 2010, 7:17 a.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 |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/qemu-char.c b/qemu-char.c
index ac65a1c..bc76000 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -522,8 +522,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 {