From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Tue, 30 May 2017 08:33:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-23' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d0eda02938054268751c6c7bf00219f695b0ca8b;p=qemu.git

Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-23' into staging

QAPI patches for 2017-05-23

# gpg: Signature made Tue 23 May 2017 12:33:32 PM BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* armbru/tags/pull-qapi-2017-05-23:
  qapi-schema: Remove obsolete note from ObjectTypeInfo
  block: Use QDict helpers for --force-share
  shutdown: Expose bool cause in SHUTDOWN and RESET events
  shutdown: Add source information to SHUTDOWN and RESET
  shutdown: Preserve shutdown cause through replay
  shutdown: Prepare for use of an enum in reset/shutdown_request
  shutdown: Simplify shutdown_signal
  sockets: Plug memory leak in socket_address_flatten()
  scripts/qmp/qom-set: fix the value argument passed to srv.command()

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

d0eda02938054268751c6c7bf00219f695b0ca8b
diff --cc include/sysemu/sysemu.h
index ed8fe3bf34,a86b8cfad7..69046ebf1b
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@@ -62,11 -80,12 +80,11 @@@ void qemu_system_debug_request(void)
  void qemu_system_vmstop_request(RunState reason);
  void qemu_system_vmstop_request_prepare(void);
  bool qemu_vmstop_requested(RunState *r);
- int qemu_shutdown_requested_get(void);
- int qemu_reset_requested_get(void);
+ ShutdownCause qemu_shutdown_requested_get(void);
+ ShutdownCause qemu_reset_requested_get(void);
  void qemu_system_killed(int signal, pid_t pid);
- void qemu_system_reset(bool report);
+ void qemu_system_reset(ShutdownCause reason);
  void qemu_system_guest_panicked(GuestPanicInformation *info);
 -size_t qemu_target_page_size(void);
  
  void qemu_add_exit_notifier(Notifier *notify);
  void qemu_remove_exit_notifier(Notifier *notify);