From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZsBHq-0000ez-FC for qemu-devel@nongnu.org; Fri, 30 Oct 2015 11:08:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZsBHp-00034D-JY for qemu-devel@nongnu.org; Fri, 30 Oct 2015 11:08:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZsBHp-00033s-FE for qemu-devel@nongnu.org; Fri, 30 Oct 2015 11:08:13 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 167D8354163 for ; Fri, 30 Oct 2015 15:08:13 +0000 (UTC) From: Eduardo Habkost Date: Fri, 30 Oct 2015 13:07:53 -0200 Message-Id: <1446217682-24421-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1446217682-24421-1-git-send-email-ehabkost@redhat.com> References: <1446217682-24421-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v3 02/11] vl.c: Use error_report() when reporting shutdown signal List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Andrew Jones , Markus Armbruster This usage of fprintf(stderr) can't be directly converted to error_report() like the others, because a single error message is split into multiple fprintf() calls. Make separate error_report() calls for each case. Suggested-by: Markus Armbruster Reviewed-by: Markus Armbruster Signed-off-by: Eduardo Habkost --- vl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 4ee460f..447cb9a 100644 --- a/vl.c +++ b/vl.c @@ -1626,14 +1626,14 @@ static int qemu_shutdown_requested(void) static void qemu_kill_report(void) { if (!qtest_driver() && shutdown_signal != -1) { - 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); + error_report("terminating on signal %d", shutdown_signal); } else { - fprintf(stderr, " from pid " FMT_pid "\n", shutdown_pid); + error_report("terminating on signal %d from pid " FMT_pid, + shutdown_signal, shutdown_pid); } shutdown_signal = -1; } -- 2.1.0