Patchwork [10/15] vl.c: fix warning with _FORTIFY_SOURCE

login
register
mail settings
Submitter Kirill A. Shutemov
Date Jan. 2, 2010, 3:45 a.m.
Message ID <1262403933-26881-10-git-send-email-kirill@shutemov.name>
Download mbox | patch
Permalink /patch/42001/
State New
Headers show

Comments

Kirill A. Shutemov - Jan. 2, 2010, 3:45 a.m.
CC    i386-softmmu/vl.o
cc1: warnings being treated as errors
/usr/src/RPM/BUILD/qemu-0.11.92/vl.c: In function 'qemu_event_increment':
/usr/src/RPM/BUILD/qemu-0.11.92/vl.c:3404: error: ignoring return value of 'write', declared with attribute warn_unused_result
/usr/src/RPM/BUILD/qemu-0.11.92/vl.c: In function 'main':
/usr/src/RPM/BUILD/qemu-0.11.92/vl.c:5774: error: ignoring return value of 'write', declared with attribute warn_unused_result
/usr/src/RPM/BUILD/qemu-0.11.92/vl.c:6064: error: ignoring return value of 'chdir', declared with attribute warn_unused_result
/usr/src/RPM/BUILD/qemu-0.11.92/vl.c:6083: error: ignoring return value of 'chdir', declared with attribute warn_unused_result
make[1]: *** [vl.o] Error 1

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
---
 vl.c |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

Patch

diff --git a/vl.c b/vl.c
index e881e45..7fcde35 100644
--- a/vl.c
+++ b/vl.c
@@ -3390,11 +3390,17 @@  static int io_thread_fd = -1;
 static void qemu_event_increment(void)
 {
     static const char byte = 0;
+    int ret;
 
     if (io_thread_fd == -1)
         return;
 
-    write(io_thread_fd, &byte, sizeof(byte));
+    ret = write(io_thread_fd, &byte, sizeof(byte));
+    if (ret < 0 && (errno != EINTR && errno != EAGAIN)) {
+        fprintf(stderr, "qemu_event_increment: write() filed: %s\n",
+                strerror(errno));
+        exit (1);
+    }
 }
 
 static void qemu_event_read(void *opaque)
@@ -5778,7 +5784,10 @@  int main(int argc, char **argv, char **envp)
 #ifndef _WIN32
         if (daemonize) {
             uint8_t status = 1;
-            write(fds[1], &status, 1);
+            if (qemu_write_full(fds[1], &status, 1) != 1) {
+                perror("write()");
+                exit(1);
+            }
         } else
 #endif
             fprintf(stderr, "Could not acquire pid file: %s\n", strerror(errno));
@@ -6065,18 +6074,15 @@  int main(int argc, char **argv, char **envp)
 #ifndef _WIN32
     if (daemonize) {
 	uint8_t status = 0;
-	ssize_t len;
 
-    again1:
-	len = write(fds[1], &status, 1);
-	if (len == -1 && (errno == EINTR))
-	    goto again1;
-
-	if (len != 1)
+	if (qemu_write_full(fds[1], &status, 1) != 1)
 	    exit(1);
 
-	chdir("/");
-	TFR(fd = qemu_open("/dev/null", O_RDWR));
+        if (chdir("/")) {
+            perror("chdir()");
+            exit(1);
+        }
+        TFR(fd = qemu_open("/dev/null", O_RDWR));
 	if (fd == -1)
 	    exit(1);
     }
@@ -6094,7 +6100,10 @@  int main(int argc, char **argv, char **envp)
             fprintf(stderr, "chroot failed\n");
             exit(1);
         }
-        chdir("/");
+        if (chdir("/")) {
+            perror("chdir()");
+            exit(1);
+        }
     }
 
     if (run_as) {