From patchwork Mon Mar 14 13:44:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 86742 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B82DAB6F76 for ; Tue, 15 Mar 2011 00:45:57 +1100 (EST) Received: from localhost ([127.0.0.1]:57608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pz85o-0007C4-1y for incoming@patchwork.ozlabs.org; Mon, 14 Mar 2011 09:45:52 -0400 Received: from [140.186.70.92] (port=49615 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pz855-0007An-Gb for qemu-devel@nongnu.org; Mon, 14 Mar 2011 09:45:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pz850-0002ye-2s for qemu-devel@nongnu.org; Mon, 14 Mar 2011 09:45:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34829) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pz84z-0002xU-Le for qemu-devel@nongnu.org; Mon, 14 Mar 2011 09:45:02 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2EDj0oA016066 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 14 Mar 2011 09:45:00 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2EDixaR015600 for ; Mon, 14 Mar 2011 09:45:00 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 1B05C18D3E9; Mon, 14 Mar 2011 15:44:59 +0200 (IST) Date: Mon, 14 Mar 2011 15:44:59 +0200 From: Gleb Natapov To: qemu-devel@nongnu.org Message-ID: <20110314134459.GR10151@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCHv2] report that QEMU process was killed by a signal X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Currently when rogue script kills QEMU process (using TERM/INT/HUP signal) it looks indistinguishable from system shutdown. Lets report that QMEU was killed and leave some clues about the killed identity. Signed-off-by: Gleb Natapov --- v1->v2: - print message from a main loop instead of signal handler -- Gleb. diff --git a/os-posix.c b/os-posix.c index 38c29d1..36d937c 100644 --- a/os-posix.c +++ b/os-posix.c @@ -61,9 +61,9 @@ void os_setup_early_signal_handling(void) sigaction(SIGPIPE, &act, NULL); } -static void termsig_handler(int signal) +static void termsig_handler(int signal, siginfo_t *info, void *c) { - qemu_system_shutdown_request(); + qemu_system_killed(info->si_signo, info->si_pid); } static void sigchld_handler(int signal) @@ -76,7 +76,8 @@ void os_setup_signal_handling(void) struct sigaction act; memset(&act, 0, sizeof(act)); - act.sa_handler = termsig_handler; + act.sa_sigaction = termsig_handler; + act.sa_flags = SA_SIGINFO; sigaction(SIGINT, &act, NULL); sigaction(SIGHUP, &act, NULL); sigaction(SIGTERM, &act, NULL); diff --git a/sysemu.h b/sysemu.h index 0a83ab9..fc7048a 100644 --- a/sysemu.h +++ b/sysemu.h @@ -66,6 +66,8 @@ void qemu_system_vmstop_request(int reason); int qemu_shutdown_requested(void); int qemu_reset_requested(void); int qemu_powerdown_requested(void); +void qemu_system_killed(int signal, int pid); +void qemu_kill_report(void); extern qemu_irq qemu_system_powerdown; void qemu_system_reset(void); diff --git a/vl.c b/vl.c index 5e007a7..d14c42d 100644 --- a/vl.c +++ b/vl.c @@ -1213,7 +1213,7 @@ typedef struct QEMUResetEntry { static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers = QTAILQ_HEAD_INITIALIZER(reset_handlers); static int reset_requested; -static int shutdown_requested; +static int shutdown_requested, shutdown_signal = -1, shutdown_pid; static int powerdown_requested; static int debug_requested; static int vmstop_requested; @@ -1225,6 +1225,15 @@ int qemu_shutdown_requested(void) return r; } +void qemu_kill_report(void) +{ + if (shutdown_signal != -1) { + fprintf(stderr, "Got signal %d from pid %d\n", + shutdown_signal, shutdown_pid); + shutdown_signal = -1; + } +} + int qemu_reset_requested(void) { int r = reset_requested; @@ -1298,6 +1307,13 @@ void qemu_system_reset_request(void) qemu_notify_event(); } +void qemu_system_killed(int signal, int pid) +{ + shutdown_signal = signal; + shutdown_pid = pid; + qemu_system_shutdown_request(); +} + void qemu_system_shutdown_request(void) { shutdown_requested = 1; @@ -1441,6 +1457,7 @@ static void main_loop(void) vm_stop(VMSTOP_DEBUG); } if (qemu_shutdown_requested()) { + qemu_kill_report(); monitor_protocol_event(QEVENT_SHUTDOWN, NULL); if (no_shutdown) { vm_stop(VMSTOP_SHUTDOWN);