From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwOqa-0004KY-T9 for qemu-devel@nongnu.org; Tue, 18 Oct 2016 03:30:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwOqX-0005J0-Mi for qemu-devel@nongnu.org; Tue, 18 Oct 2016 03:30:04 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:54939 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwOqX-0005Io-GE for qemu-devel@nongnu.org; Tue, 18 Oct 2016 03:30:01 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u9I7TIgh007450 for ; Tue, 18 Oct 2016 03:30:00 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0b-001b2d01.pphosted.com with ESMTP id 265dcxwcph-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 18 Oct 2016 03:30:00 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Oct 2016 08:29:59 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 1EABD219005E for ; Tue, 18 Oct 2016 08:29:14 +0100 (BST) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u9I7Tv3G25755832 for ; Tue, 18 Oct 2016 07:29:57 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u9I7TurZ011883 for ; Tue, 18 Oct 2016 01:29:57 -0600 From: Christian Borntraeger Date: Tue, 18 Oct 2016 09:29:54 +0200 Message-Id: <1476775794-108012-1-git-send-email-borntraeger@de.ibm.com> Subject: [Qemu-devel] [PATCH v2] vl: exit qemu on guest panic if -no-shutdown is not set List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, Eric Blake , Markus Armbruster , Christian Borntraeger For automated testing purposes it can be helpful to exit qemu (poweroff) when the guest panics. Make this the default unless -no-shutdown is specified. For internal-errors like errors from KVM_RUN the behaviour is not changed, in other words QEMU does not exit to allow debugging in the QEMU monitor. Signed-off-by: Christian Borntraeger --- qapi-schema.json | 4 ++-- vl.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index ded1179..2b83ee4 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4488,10 +4488,10 @@ # # @pause: system pauses # -# Since: 2.1 +# Since: 2.1 (poweroff since 2.8) ## { 'enum': 'GuestPanicAction', - 'data': [ 'pause' ] } + 'data': [ 'pause', 'poweroff' ] } ## # @rtc-reset-reinjection diff --git a/vl.c b/vl.c index c657acd..e1ef81f 100644 --- a/vl.c +++ b/vl.c @@ -1783,6 +1783,11 @@ void qemu_system_guest_panicked(void) } qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_PAUSE, &error_abort); vm_stop(RUN_STATE_GUEST_PANICKED); + if (!no_shutdown) { + qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_POWEROFF, + &error_abort); + qemu_system_shutdown_request(); + } } void qemu_system_reset_request(void) -- 2.5.5