Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
commita4efdb6b24dceccd97f0a615a1752eb6fb92d46b
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 8 Jul 2019 14:21:20 +0000 (8 15:21 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 8 Jul 2019 14:21:20 +0000 (8 15:21 +0100)
tree62ff443f3810dfde90b675fe9bdb17da737ecabc
parentdf34fe314b5da628bc9a2664fb1b887bc0a6cc6d
parentf7077c9860a438087c2d9a8cc27cb8438c98a748
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- virtio-scsi: Fix request resubmission after I/O error with iothreads
- qcow2: Fix missing v2/v3 subformat aliases for amend
- qcow(1): More specific error message for wrong format version
- MAINTAINERS: update RBD block maintainer

# gpg: Signature made Mon 08 Jul 2019 15:17:27 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  qcow2: Allow -o compat=v3 during qemu-img amend
  MAINTAINERS: update RBD block maintainer
  block/qcow: Improve error when opening qcow2 files as qcow
  virtio-scsi: restart DMA after iothread
  qdev: add qdev_add_vm_change_state_handler()
  vl: add qemu_add_vm_change_state_handler_prio()

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