diff mbox series

[PULL,09/12] qmp: don't emit the RESET event on wakeup

Message ID 20190720151846.7450-10-pbonzini@redhat.com
State New
Headers show
Series [PULL,01/12] target/i386: kvm: Demand nested migration kernel capabilities only when vCPU may have enabled VMX | expand

Commit Message

Paolo Bonzini July 20, 2019, 3:18 p.m. UTC 
From: Nicholas Piggin <npiggin@gmail.com>

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>
---
 vl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/vl.c b/vl.c
index a5808f9..cefe5a3 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();