Patchwork [6/8] char: unix: For files that are nonblocking, report -EAGAIN to calling functions

login
register
mail settings
Submitter Amit Shah
Date April 7, 2010, 9:02 p.m.
Message ID <1270674156-9345-7-git-send-email-amit.shah@redhat.com>
Download mbox | patch
Permalink /patch/49647/
State New
Headers show

Comments

Amit Shah - April 7, 2010, 9:02 p.m.
If the chardev we're writing to is nonblocking, just report -EAGAIN to
the caller so that the caller can take any further action if it so
wishes.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 qemu-char.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

Patch

diff --git a/qemu-char.c b/qemu-char.c
index 208466f..57e9af3 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -497,11 +497,23 @@  int send_all(int fd, const void *buf, int len1)
 static int unix_write(int fd, const uint8_t *buf, int len1)
 {
     int ret, len;
+    int flags;
+    bool nonblock;
+
+    flags = fcntl(fd, F_GETFL);
+    if (flags == -1) {
+        flags = 0;
+    }
+
+    nonblock = flags & O_NONBLOCK;
 
     len = len1;
     while (len > 0) {
         ret = write(fd, buf, len);
         if (ret < 0) {
+            if (errno == EAGAIN && nonblock) {
+                return -EAGAIN;
+            }
             if (errno != EINTR && errno != EAGAIN) {
                 if (len1 - len) {
                     return len1 - len;