mirror of https://gitee.com/openkylin/qemu.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
This commit is contained in:
parent
c7ba218da1
commit
bd54b86394
7
vl.c
7
vl.c
|
@ -8626,11 +8626,6 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
if (daemonize && !nographic && vnc_display == NULL) {
|
|
||||||
fprintf(stderr, "Can only daemonize if using -nographic or -vnc\n");
|
|
||||||
daemonize = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (daemonize) {
|
if (daemonize) {
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
|
|
||||||
|
@ -8668,7 +8663,6 @@ int main(int argc, char **argv)
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
||||||
umask(027);
|
umask(027);
|
||||||
chdir("/");
|
|
||||||
|
|
||||||
signal(SIGTSTP, SIG_IGN);
|
signal(SIGTSTP, SIG_IGN);
|
||||||
signal(SIGTTOU, SIG_IGN);
|
signal(SIGTTOU, SIG_IGN);
|
||||||
|
@ -8974,6 +8968,7 @@ int main(int argc, char **argv)
|
||||||
if (len != 1)
|
if (len != 1)
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
||||||
|
chdir("/");
|
||||||
TFR(fd = open("/dev/null", O_RDWR));
|
TFR(fd = open("/dev/null", O_RDWR));
|
||||||
if (fd == -1)
|
if (fd == -1)
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
Loading…
Reference in New Issue