diff options
| author | Hanna Reitz | 2022-06-09 14:27:00 +0200 |
|---|---|---|
| committer | Hanna Reitz | 2022-07-12 14:30:48 +0200 |
| commit | eed29d49ecc5d0db82b72538745223d09a54ee97 (patch) | |
| tree | ddedc0a155202a2b0f9e130bb22225a54aeb552f /softmmu | |
| parent | qsd: Unlink absolute PID file path (diff) | |
| download | qemu-eed29d49ecc5d0db82b72538745223d09a54ee97.tar.gz qemu-eed29d49ecc5d0db82b72538745223d09a54ee97.tar.xz qemu-eed29d49ecc5d0db82b72538745223d09a54ee97.zip | |
vl: Conditionally register PID file unlink notifier
Currently, the exit notifier for unlinking the PID file is registered
unconditionally. Limit it to only when we actually do create a PID
file.
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220609122701.17172-3-hreitz@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/vl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index 3f264d4b09..36f46fcdad 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1526,9 +1526,7 @@ static Notifier qemu_unlink_pidfile_notifier; static void qemu_unlink_pidfile(Notifier *n, void *data) { - if (pid_file) { - unlink(pid_file); - } + unlink(pid_file); } static const QEMUOption *lookup_opt(int argc, char **argv, @@ -2431,13 +2429,15 @@ static void qemu_maybe_daemonize(const char *pid_file) os_daemonize(); rcu_disable_atfork(); - if (pid_file && !qemu_write_pidfile(pid_file, &err)) { - error_reportf_err(err, "cannot create PID file: "); - exit(1); - } + if (pid_file) { + if (!qemu_write_pidfile(pid_file, &err)) { + error_reportf_err(err, "cannot create PID file: "); + exit(1); + } - qemu_unlink_pidfile_notifier.notify = qemu_unlink_pidfile; - qemu_add_exit_notifier(&qemu_unlink_pidfile_notifier); + qemu_unlink_pidfile_notifier.notify = qemu_unlink_pidfile; + qemu_add_exit_notifier(&qemu_unlink_pidfile_notifier); + } } static void qemu_init_displays(void) |