OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

s390/ipl: fix ipl with -no-reboot

Browse Source 
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: a30fb811cb (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>
This commit is contained in:
Christian Borntraeger 2018-06-22 12:29:28 +02:00 committed by Cornelia Huck
parent 281bd28122
commit 76ed4b18de
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/s390x/ipl.c
View File

@ -535,7 +535,13 @@ void s390_ipl_reset_request(CPUState *cs, enum s390_reset reset_type)
ipl->iplb_valid = s390_gen_initial_iplb(ipl); ipl->iplb_valid = s390_gen_initial_iplb(ipl);
} }
} }
qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); if (reset_type == S390_RESET_MODIFIED_CLEAR ||
reset_type == S390_RESET_LOAD_NORMAL) {
/* ignore -no-reboot, send no event */
qemu_system_reset_request(SHUTDOWN_CAUSE_SUBSYSTEM_RESET);
} else {
qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
}
/* as this is triggered by a CPU, make sure to exit the loop */ /* as this is triggered by a CPU, make sure to exit the loop */
if (tcg_enabled()) { if (tcg_enabled()) {
cpu_loop_exit(cs); cpu_loop_exit(cs);

4
include/sysemu/sysemu.h
View File

@ -44,6 +44,10 @@ typedef enum ShutdownCause {
turns that into a shutdown */ turns that into a shutdown */
SHUTDOWN_CAUSE_GUEST_PANIC, /* Guest panicked, and command line turns SHUTDOWN_CAUSE_GUEST_PANIC, /* Guest panicked, and command line turns
that into a shutdown */ that into a shutdown */
SHUTDOWN_CAUSE_SUBSYSTEM_RESET,/* Partial guest reset that does not trigger
QMP events and ignores --no-reboot. This
is useful for sanitize hypercalls on s390
that are used during kexec/kdump/boot */
SHUTDOWN_CAUSE__MAX, SHUTDOWN_CAUSE__MAX,
} ShutdownCause; } ShutdownCause;

4
vl.c
View File

@ -1645,7 +1645,7 @@ void qemu_system_reset(ShutdownCause reason)
} else { } else {
qemu_devices_reset(); qemu_devices_reset();
} }
if (reason) { if (reason != SHUTDOWN_CAUSE_SUBSYSTEM_RESET) {
qapi_event_send_reset(shutdown_caused_by_guest(reason), qapi_event_send_reset(shutdown_caused_by_guest(reason),
&error_abort); &error_abort);
} }
@ -1691,7 +1691,7 @@ void qemu_system_guest_panicked(GuestPanicInformation *info)
void qemu_system_reset_request(ShutdownCause reason) void qemu_system_reset_request(ShutdownCause reason)
{ {
if (no_reboot) { if (no_reboot && reason != SHUTDOWN_CAUSE_SUBSYSTEM_RESET) {
shutdown_requested = reason; shutdown_requested = reason;
} else { } else {
reset_requested = reason; reset_requested = reason;