Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 13 Dec 2019 18:14:07 +0000 (18:14 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 13 Dec 2019 18:14:07 +0000 (18:14 +0000)
commit084a398bf8aa7634738e6c6c0103236ee1b3b72f
tree44d7faaeaeff6dd48eac2e3faae2a878e5a1457b
parent4148d142a8cbbce10bb77e560997ae6b482e5edf
parent86d2a49b41832355ab50cf60cec0cd50680fc0e5
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

# gpg: Signature made Fri 13 Dec 2019 14:32:11 GMT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  iothread: document -object iothread on man page
  virtio-blk: advertise F_WCE (F_FLUSH) if F_CONFIG_WCE is advertised

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