Commit 76ed4b18 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Cornelia Huck
Browse files

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: a30fb811 (s390x: refactor reset/reipl handling)
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20180622102928.173420-1-borntraeger@de.ibm.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 281bd281

hw/s390x/ipl.c

+7 −1
Original line number Diff line number Diff line
@@ -535,7 +535,13 @@ void s390_ipl_reset_request(CPUState *cs, enum s390_reset reset_type) 
            ipl->iplb_valid = s390_gen_initial_iplb(ipl);

        }

    }

    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 */

    if (tcg_enabled()) {

        cpu_loop_exit(cs);

include/sysemu/sysemu.h

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ typedef enum ShutdownCause { 
                                     turns that into a shutdown */

    SHUTDOWN_CAUSE_GUEST_PANIC,   /* Guest panicked, and command line turns

                                     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,

} ShutdownCause;

vl.c

+2 −2
Original line number Diff line number Diff line
@@ -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;