From: ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Fri, 18 Jul 2008 16:34:43 +0000 (+0000)
Subject: Do not disturb old fd flags (eg O_APPEND) when setting nonblock, by
X-Git-Tag: stefano.display-merge-start~901
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fd58ff9dc7bcb5a795eca12e8d8ccd467f54df50;p=qemu-xen-4.0-testing.git

Do not disturb old fd flags (eg O_APPEND) when setting nonblock, by
Ian Jackson.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4888 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/vl.c b/vl.c
index 613fa849..59e58a11 100644
--- a/vl.c
+++ b/vl.c
@@ -2141,7 +2141,9 @@ static inline int send_all(int fd, const uint8_t *buf, int len1)
 
 void socket_set_nonblock(int fd)
 {
-    fcntl(fd, F_SETFL, O_NONBLOCK);
+    int f;
+    f = fcntl(fd, F_GETFL);
+    fcntl(fd, F_SETFL, f | O_NONBLOCK);
 }
 #endif /* !_WIN32 */