From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KLSgg-0005Fw-IV
	for qemu-devel@nongnu.org; Tue, 22 Jul 2008 20:58:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KLSge-0005Fh-Ga
	for qemu-devel@nongnu.org; Tue, 22 Jul 2008 20:58:37 -0400
Received: from [199.232.76.173] (port=45218 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KLSge-0005Fe-DV
	for qemu-devel@nongnu.org; Tue, 22 Jul 2008 20:58:36 -0400
Received: from savannah.gnu.org ([199.232.41.3]:37415 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1KLSge-00037v-38
	for qemu-devel@nongnu.org; Tue, 22 Jul 2008 20:58:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <anthony@codemonkey.ws>) id 1KLSgc-0001kS-Hy
	for qemu-devel@nongnu.org; Wed, 23 Jul 2008 00:58:34 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1KLSgc-0001kF-1X
	for qemu-devel@nongnu.org; Wed, 23 Jul 2008 00:58:34 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1KLSgc-0001kF-1X@cvs.savannah.gnu.org>
Date: Wed, 23 Jul 2008 00:58:34 +0000
Subject: [Qemu-devel] [4924] Fix -daemonize option
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4924
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4924
Author:   aliguori
Date:     2008-07-23 00:58:33 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
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>

Modified Paths:
--------------
    trunk/vl.c

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2008-07-22 07:07:34 UTC (rev 4923)
+++ trunk/vl.c	2008-07-23 00:58:33 UTC (rev 4924)
@@ -8626,11 +8626,6 @@
     }
 
 #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 @@
 	    exit(1);
 
 	umask(027);
-	chdir("/");
 
         signal(SIGTSTP, SIG_IGN);
         signal(SIGTTOU, SIG_IGN);
@@ -8974,6 +8968,7 @@
 	if (len != 1)
 	    exit(1);
 
+	chdir("/");
 	TFR(fd = open("/dev/null", O_RDWR));
 	if (fd == -1)
 	    exit(1);