From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 23 Jul 2008 00:58:33 +0000 (+0000)
Subject: Fix -daemonize option
X-Git-Tag: stefano.display-merge-start~865
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bd54b863947933a985f53e1ca6002752abd8b645;p=qemu-xen-4.4-testing.git

Fix -daemonize option

When using -daemonize, we want to avoid chdir() until after we've opened the
block devices.  It's also perfectly fine to use -dameonize along with SDL.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



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

diff --git a/vl.c b/vl.c
index f057a5e6b..d94ebb172 100644
--- a/vl.c
+++ b/vl.c
@@ -8626,11 +8626,6 @@ int main(int argc, char **argv)
     }
 
 #ifndef _WIN32
-    if (daemonize && !nographic && vnc_display == NULL) {
-	fprintf(stderr, "Can only daemonize if using -nographic or -vnc\n");
-	daemonize = 0;
-    }
-
     if (daemonize) {
 	pid_t pid;
 
@@ -8668,7 +8663,6 @@ int main(int argc, char **argv)
 	    exit(1);
 
 	umask(027);
-	chdir("/");
 
         signal(SIGTSTP, SIG_IGN);
         signal(SIGTTOU, SIG_IGN);
@@ -8974,6 +8968,7 @@ int main(int argc, char **argv)
 	if (len != 1)
 	    exit(1);
 
+	chdir("/");
 	TFR(fd = open("/dev/null", O_RDWR));
 	if (fd == -1)
 	    exit(1);