qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 3/9] shutdown: Simplify shutdown_signal
Date: Tue, 23 May 2017 14:30:32 +0200	[thread overview]
Message-ID: <1495542638-12335-4-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1495542638-12335-1-git-send-email-armbru@redhat.com>

From: Eric Blake <eblake@redhat.com>

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 <armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-Id: <20170515214114.15442-2-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 vl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vl.c b/vl.c
index 1512df6..b42b0b3 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 : "<unknown process>");
             g_free(shutdown_cmd);
         }
-        shutdown_signal = -1;
+        shutdown_signal = 0;
     }
 }
 
-- 
2.7.4

  parent reply	other threads:[~2017-05-23 12:30 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-23 12:30 [Qemu-devel] [PULL 0/9] QAPI patches for 2017-05-23 Markus Armbruster
2017-05-23 12:30 ` [Qemu-devel] [PULL 1/9] scripts/qmp/qom-set: fix the value argument passed to srv.command() Markus Armbruster
2017-05-23 12:30 ` [Qemu-devel] [PULL 2/9] sockets: Plug memory leak in socket_address_flatten() Markus Armbruster
2017-05-23 12:30 ` Markus Armbruster [this message]
2017-05-23 12:30 ` [Qemu-devel] [PULL 4/9] shutdown: Prepare for use of an enum in reset/shutdown_request Markus Armbruster
2017-05-23 12:30 ` [Qemu-devel] [PULL 5/9] shutdown: Preserve shutdown cause through replay Markus Armbruster
2017-05-23 12:30 ` [Qemu-devel] [PULL 6/9] shutdown: Add source information to SHUTDOWN and RESET Markus Armbruster
2017-05-23 12:30 ` [Qemu-devel] [PULL 7/9] shutdown: Expose bool cause in SHUTDOWN and RESET events Markus Armbruster
2017-05-23 12:30 ` [Qemu-devel] [PULL 8/9] block: Use QDict helpers for --force-share Markus Armbruster
2017-05-23 12:30 ` [Qemu-devel] [PULL 9/9] qapi-schema: Remove obsolete note from ObjectTypeInfo Markus Armbruster
2017-05-30  8:37 ` [Qemu-devel] [PULL 0/9] QAPI patches for 2017-05-23 Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1495542638-12335-4-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).