| Message ID | 1476775794-108012-1-git-send-email-borntraeger@de.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 10/18/2016 02:29 AM, Christian Borntraeger wrote: > 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 <borntraeger@de.ibm.com> > --- > qapi-schema.json | 4 ++-- > vl.c | 5 +++++ > 2 files changed, 7 insertions(+), 2 deletions(-) Shouldn't hurt libvirt, since that uses -no-shutdown. Reviewed-by: Eric Blake <eblake@redhat.com>
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)
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 <borntraeger@de.ibm.com> --- qapi-schema.json | 4 ++-- vl.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)