diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2018-06-22 12:29:28 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2018-07-02 10:37:38 +0200 |
| commit | 76ed4b18debfe597329d1f6a9eb2ec9ffa751ecd (patch) | |
| tree | 7a05efba9a105ba959c87b5cf1ac96f402da147e /vl.c | |
| parent | 281bd281222776229d5dbf84d1a5c6d8d9d2a34b (diff) | |
| download | focaccia-qemu-76ed4b18debfe597329d1f6a9eb2ec9ffa751ecd.tar.gz focaccia-qemu-76ed4b18debfe597329d1f6a9eb2ec9ffa751ecd.zip | |
s390/ipl: fix ipl with -no-reboot
kexec/kdump as well as the bootloader use a subcode of diagnose 308 that is supposed to reset the I/O subsystem but not comprise a full "reboot". With the latest refactoring this is now broken when -no-reboot is used or when libvirt acts on a reboot QMP event, for example a virt-install from iso images. We need to mark these "subsystem resets" as special. Fixes: a30fb811cbe9 (s390x: refactor reset/reipl handling) Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: David Hildenbrand <david@redhat.com> Message-Id: <20180622102928.173420-1-borntraeger@de.ibm.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vl.c b/vl.c index ef6cfcec40..9442beee21 100644 --- a/vl.c +++ b/vl.c @@ -1645,7 +1645,7 @@ void qemu_system_reset(ShutdownCause reason) } else { qemu_devices_reset(); } - if (reason) { + if (reason != SHUTDOWN_CAUSE_SUBSYSTEM_RESET) { qapi_event_send_reset(shutdown_caused_by_guest(reason), &error_abort); } @@ -1691,7 +1691,7 @@ void qemu_system_guest_panicked(GuestPanicInformation *info) void qemu_system_reset_request(ShutdownCause reason) { - if (no_reboot) { + if (no_reboot && reason != SHUTDOWN_CAUSE_SUBSYSTEM_RESET) { shutdown_requested = reason; } else { reset_requested = reason; |