OSDN Git Service

Merge remote-tracking branch 'armbru/tags/pull-qapi-2017-05-23' into staging
authorStefan Hajnoczi <stefanha@redhat.com>
Tue, 30 May 2017 08:33:36 +0000 (09:33 +0100)
committerStefan Hajnoczi <stefanha@redhat.com>
Tue, 30 May 2017 08:33:40 +0000 (09:33 +0100)
commitd0eda02938054268751c6c7bf00219f695b0ca8b
tree9fd7119c0c284362d2a261b8e177d13d69e7fa3e
parent62e570b1c50cac88fb0e940cfcb7820732106c20
parent8c1bc1e9d770e7576fc272424dd48eb008ebff39
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>
include/sysemu/sysemu.h
migration/colo.c
migration/savevm.c
qapi-schema.json
vl.c