From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=53866 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q5DNW-0004AB-Qf
	for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:37:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gleb@redhat.com>) id 1Q5DNV-0000uz-9L
	for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:37:18 -0400
Received: from mx1.redhat.com ([209.132.183.28]:41469)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gleb@redhat.com>) id 1Q5DNU-0000uf-VW
	for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:37:17 -0400
Date: Thu, 31 Mar 2011 10:37:13 +0200
From: Gleb Natapov <gleb@redhat.com>
Message-ID: <20110331083713.GH7766@redhat.com>
References: <1301519018-26680-1-git-send-email-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1301519018-26680-1-git-send-email-peter.maydell@linaro.org>
Subject: [Qemu-devel] Re: [PATCH] vl.c: Tidy up message printed when we exit
	on a signal
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org, patches@linaro.org

On Wed, Mar 30, 2011 at 10:03:38PM +0100, Peter Maydell wrote:
> Tidy up the message printed when qemu exits due to a signal, so that
> it's clearer where the message is coming from and that it's not just
> stray debug output.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Gleb Natapov <gleb@redhat.com>

> ---
>  vl.c |   11 +++++++++--
>  1 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/vl.c b/vl.c
> index 5c9205f..4d9e503 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -1169,8 +1169,15 @@ int qemu_shutdown_requested(void)
>  void qemu_kill_report(void)
>  {
>      if (shutdown_signal != -1) {
> -        fprintf(stderr, "Got signal %d from pid %d\n",
> -                         shutdown_signal, shutdown_pid);
> +        fprintf(stderr, "qemu: terminating on signal %d", 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.
> +             */
> +            fputc('\n', stderr);
> +        } else {
> +            fprintf(stderr, " from pid %d\n", shutdown_pid);
> +        }
>          shutdown_signal = -1;
>      }
>  }
> -- 
> 1.7.1

--
			Gleb.