From patchwork Wed May 19 16:03:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 52996 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 15D5FB7D57 for ; Thu, 20 May 2010 02:28:12 +1000 (EST) Received: from localhost ([127.0.0.1]:52666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEm7s-0002cY-Uo for incoming@patchwork.ozlabs.org; Wed, 19 May 2010 12:28:08 -0400 Received: from [140.186.70.92] (port=49627 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OElk2-0003xl-GW for qemu-devel@nongnu.org; Wed, 19 May 2010 12:03:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OElk0-0005Vm-Ox for qemu-devel@nongnu.org; Wed, 19 May 2010 12:03:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52353) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OElk0-0005Vb-FW for qemu-devel@nongnu.org; Wed, 19 May 2010 12:03:28 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4JG3RiI017820 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 19 May 2010 12:03:27 -0400 Received: from localhost (vpn-8-1.rdu.redhat.com [10.11.8.1]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4JG3Q5G007420; Wed, 19 May 2010 12:03:27 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Wed, 19 May 2010 13:03:01 -0300 Message-Id: <1274284982-15125-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1274284982-15125-1-git-send-email-lcapitulino@redhat.com> References: <1274284982-15125-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 6/7] Monitor: Return before exiting with 'quit' 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 This is a new version of the (now reverted) following commit: 0e8d2b5575938b8876a3c4bb66ee13c5d306fb6d The 'quit' Monitor command (implemented by do_quit()) calls exit() directly, this is problematic under QMP because QEMU exits before having a chance to send the ok response. Clients don't know if QEMU exited because of a problem or because the 'quit' command has been executed. This commit fixes that by making do_quit() use qemu_system_shutdown_request(), so that we exit gracefully. Thanks to Paolo Bonzini for suggesting this solution. Signed-off-by: Luiz Capitulino --- monitor.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index 2e202ff..ad50f12 100644 --- a/monitor.c +++ b/monitor.c @@ -1020,7 +1020,10 @@ static void do_info_cpu_stats(Monitor *mon) */ static int do_quit(Monitor *mon, const QDict *qdict, QObject **ret_data) { - exit(0); + monitor_suspend(mon); + no_shutdown = 0; + qemu_system_shutdown_request(); + return 0; }