diff options
author | Nicholas Piggin <npiggin@gmail.com> | 2019-07-18 20:39:49 +1000 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-07-19 19:04:59 +0200 |
commit | 3bf5de5240525a52a88deb3e864646763157e2ba (patch) | |
tree | e1da91b6ca57fd6d6d303fbeb9d3dee9399de86f | |
parent | 8072aae3770aed5ed1274a3d6b83a94672c6181a (diff) | |
download | qemu-3bf5de5240525a52a88deb3e864646763157e2ba.zip qemu-3bf5de5240525a52a88deb3e864646763157e2ba.tar.gz qemu-3bf5de5240525a52a88deb3e864646763157e2ba.tar.bz2 |
qmp: don't emit the RESET event on wakeup
Commit 1405819637f53 ("qmp: don't emit the RESET event on wakeup from
S3") changed system wakeup to avoid calling qapi_event_send_reset.
Commit 76ed4b18debfe ("s390/ipl: fix ipl with -no-reboot") appears to
have inadvertently broken that logic.
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-Id: <20190718103951.10027-2-npiggin@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | vl.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1550,7 +1550,7 @@ void qemu_system_reset(ShutdownCause reason) } else { qemu_devices_reset(); } - if (reason != SHUTDOWN_CAUSE_SUBSYSTEM_RESET) { + if (reason && reason != SHUTDOWN_CAUSE_SUBSYSTEM_RESET) { qapi_event_send_reset(shutdown_caused_by_guest(reason), reason); } cpu_synchronize_all_post_reset(); |