Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2017-06-06' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 6 Jun 2017 14:37:53 +0000 (15:37 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 6 Jun 2017 14:37:54 +0000 (15:37 +0100)
commit572db7cd69bef46e94bd0bf6d7eacb1015ce714e
treed46f3860a48e4f0054fe4e4ba02b59464499eae9
parente02bbe1956d8105f2593c3137da510eeb260010b
parentc645d5acee0ae022534cb609184277ec2b4a8577
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2017-06-06' into staging

Miscellaneous patches for 2017-06-06

# gpg: Signature made Tue 06 Jun 2017 08:30:43 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

* remotes/armbru/tags/pull-misc-2017-06-06:
  monitor: fix object_del for command-line-created objects
  tests: check-qom-proplist: add checks for cmdline-created objects
  virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk
  block: Clarify documentation of BlockInfo member io-status

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>