From: Nicholas Piggin <npiggin@gmail.com>
Date: Thu, 18 Jul 2019 10:39:49 +0000 (+1000)
Subject: qmp: don't emit the RESET event on wakeup
X-Git-Tag: v4.1.0-rc2~6^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bf5de5240525a52a88deb3e864646763157e2ba;p=thirdparty%2Fqemu.git

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

diff --git a/vl.c b/vl.c
index a5808f9a020..cefe5a39686 100644
--- a/vl.c
+++ b/vl.c
@@ -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();