ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-pr-helper: Write pidfile more often 

Let's write pidfile even if user did not request --daemon but
they requested just --pidfile. Libvirt will use exactly this.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Michal Privoznik 2018-04-03 15:12:15 +02:00 committed by Paolo Bonzini
parent 8dc0bf2647
commit bd6b1c8324
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scsi/qemu-pr-helper.c
View File

@ -924,6 +924,7 @@ int main(int argc, char **argv)
Error *local_err = NULL; Error *local_err = NULL;
char *trace_file = NULL; char *trace_file = NULL;
bool daemonize = false; bool daemonize = false;
bool pidfile_specified = false;
unsigned socket_activation; unsigned socket_activation;
struct sigaction sa_sigterm; struct sigaction sa_sigterm;
@ -954,6 +955,7 @@ int main(int argc, char **argv)
case 'f': case 'f':
g_free(pidfile); g_free(pidfile);
pidfile = g_strdup(optarg); pidfile = g_strdup(optarg);
pidfile_specified = true;
break; break;
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP
case 'u': { case 'u': {
@ -1086,9 +1088,11 @@ int main(int argc, char **argv)
error_report("Failed to daemonize: %s", strerror(errno)); error_report("Failed to daemonize: %s", strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
write_pidfile();
} }
if (daemonize || pidfile_specified)
write_pidfile();
#ifdef CONFIG_LIBCAP #ifdef CONFIG_LIBCAP
if (drop_privileges() < 0) { if (drop_privileges() < 0) {
error_report("Failed to drop privileges: %s", strerror(errno)); error_report("Failed to drop privileges: %s", strerror(errno));