diff options
| author | Peter Maydell | 2019-12-13 19:14:07 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-12-13 19:14:07 +0100 |
| commit | 084a398bf8aa7634738e6c6c0103236ee1b3b72f (patch) | |
| tree | 44d7faaeaeff6dd48eac2e3faae2a878e5a1457b /include/hw/virtio | |
| parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-virtiofs-20191213a' ... (diff) | |
| parent | iothread: document -object iothread on man page (diff) | |
| download | qemu-084a398bf8aa7634738e6c6c0103236ee1b3b72f.tar.gz qemu-084a398bf8aa7634738e6c6c0103236ee1b3b72f.tar.xz qemu-084a398bf8aa7634738e6c6c0103236ee1b3b72f.zip | |
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>
Diffstat (limited to 'include/hw/virtio')
| -rw-r--r-- | include/hw/virtio/virtio-blk.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index cddcfbebe9..9c19f5b634 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -40,6 +40,7 @@ struct VirtIOBlkConf uint16_t queue_size; uint32_t max_discard_sectors; uint32_t max_write_zeroes_sectors; + bool x_enable_wce_if_config_wce; }; struct VirtIOBlockDataPlane; |