From 7af88279e4972dd6bf735b620876d54b7a355c4d Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 15 May 2017 16:41:10 -0500 Subject: [PATCH] shutdown: Simplify shutdown_signal There is no signal 0 (kill(pid, 0) has special semantics to probe whether a process is alive), rather than actually sending a signal 0). So we can use the simpler 0, instead of -1, for our sentinel of whether a shutdown request due to a signal has happened. Suggested-by: Markus Armbruster Signed-off-by: Eric Blake Reviewed-by: Markus Armbruster Reviewed-by: Alistair Francis Message-Id: <20170515214114.15442-2-eblake@redhat.com> Signed-off-by: Markus Armbruster --- vl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 1512df6e9e..b42b0b32a0 100644 --- a/vl.c +++ b/vl.c @@ -1598,7 +1598,7 @@ void vm_state_notify(int running, RunState state) } static int reset_requested; -static int shutdown_requested, shutdown_signal = -1; +static int shutdown_requested, shutdown_signal; static pid_t shutdown_pid; static int powerdown_requested; static int debug_requested; @@ -1629,7 +1629,7 @@ static int qemu_shutdown_requested(void) static void qemu_kill_report(void) { - if (!qtest_driver() && shutdown_signal != -1) { + if (!qtest_driver() && shutdown_signal) { if (shutdown_pid == 0) { /* This happens for eg ^C at the terminal, so it's worth * avoiding printing an odd message in that case. @@ -1643,7 +1643,7 @@ static void qemu_kill_report(void) shutdown_cmd ? shutdown_cmd : ""); g_free(shutdown_cmd); } - shutdown_signal = -1; + shutdown_signal = 0; } }