From patchwork Wed Jul 4 11:04:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabien Chouteau X-Patchwork-Id: 168951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B8AA32C0207 for ; Wed, 4 Jul 2012 21:05:16 +1000 (EST) Received: from localhost ([::1]:38866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmNOT-0000Lm-3i for incoming@patchwork.ozlabs.org; Wed, 04 Jul 2012 07:05:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmNOE-0000I9-2E for qemu-devel@nongnu.org; Wed, 04 Jul 2012 07:05:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmNO7-000392-Qr for qemu-devel@nongnu.org; Wed, 04 Jul 2012 07:04:57 -0400 Received: from mel.act-europe.fr ([194.98.77.210]:46103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmNO7-00038o-KZ for qemu-devel@nongnu.org; Wed, 04 Jul 2012 07:04:51 -0400 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 47B0929000D; Wed, 4 Jul 2012 13:04:56 +0200 (CEST) X-Virus-Scanned: amavisd-new at eu.adacore.com Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 49wWD90qXASO; Wed, 4 Jul 2012 13:04:56 +0200 (CEST) Received: from PomPomGalli.act-europe.fr (pompomgalli.act-europe.fr [10.10.1.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id F13FA290001; Wed, 4 Jul 2012 13:04:55 +0200 (CEST) From: Fabien Chouteau To: qemu-devel@nongnu.org Date: Wed, 4 Jul 2012 13:04:44 +0200 Message-Id: <1341399884-2135-1-git-send-email-chouteau@adacore.com> X-Mailer: git-send-email 1.7.9.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 194.98.77.210 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH V2] Use clean shutdown request for ctrl-a x X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The goal is to make ctrl-a x to close Qemu in a clean way. The current exit(0) skips a lot of cleanup/close functions, for example in block drivers. Signed-off-by: Fabien Chouteau Reviewed-by: Kevin Wolf --- qemu-char.c | 2 +- sysemu.h | 1 + vl.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/qemu-char.c b/qemu-char.c index c2aaaee..7732846 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -353,7 +353,7 @@ static int mux_proc_byte(CharDriverState *chr, MuxDriver *d, int ch) { const char *term = "QEMU: Terminated\n\r"; chr->chr_write(chr,(uint8_t *)term,strlen(term)); - exit(0); + qemu_system_force_shutdown(); break; } case 's': diff --git a/sysemu.h b/sysemu.h index bc2c788..2b2c354 100644 --- a/sysemu.h +++ b/sysemu.h @@ -50,6 +50,7 @@ void qemu_register_suspend_notifier(Notifier *notifier); void qemu_system_wakeup_request(WakeupReason reason); void qemu_system_wakeup_enable(WakeupReason reason, bool enabled); void qemu_register_wakeup_notifier(Notifier *notifier); +void qemu_system_force_shutdown(void); void qemu_system_shutdown_request(void); void qemu_system_powerdown_request(void); void qemu_system_debug_request(void); diff --git a/vl.c b/vl.c index 1329c30..bd27583 100644 --- a/vl.c +++ b/vl.c @@ -1477,6 +1477,11 @@ void qemu_system_killed(int signal, pid_t pid) { shutdown_signal = signal; shutdown_pid = pid; + qemu_system_force_shutdown(); +} + +void qemu_system_force_shutdown(void) +{ no_shutdown = 0; qemu_system_shutdown_request(); }