diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-07-08 22:17:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-07-08 22:17:28 +0100 |
| commit | 53c0123118a15cd25fe81acfa9617ddcbb9258fe (patch) | |
| tree | 80746153bae235f6e76783fe9d7339bbca2fbc09 /include/hw | |
| parent | 9db3065c62a983286d06c207f4981408cf42184d (diff) | |
| parent | 9f460c64e13897117f35ffb61f6f5e0102cabc70 (diff) | |
| download | qemu-53c0123118a15cd25fe81acfa9617ddcbb9258fe.zip qemu-53c0123118a15cd25fe81acfa9617ddcbb9258fe.tar.gz qemu-53c0123118a15cd25fe81acfa9617ddcbb9258fe.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging
Pull request
# gpg: Signature made Thu 08 Jul 2021 14:11:37 BST
# 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-gitlab/tags/block-pull-request:
block/io: Merge discard request alignments
block: Add backend_defaults property
block/file-posix: Optimize for macOS
util/async: print leaked BH name when AioContext finalizes
util/async: add a human-readable name to BHs for debugging
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/block/block.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/block/block.h b/include/hw/block/block.h index c172cbe..5902c04 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -19,6 +19,7 @@ typedef struct BlockConf { BlockBackend *blk; + OnOffAuto backend_defaults; uint32_t physical_block_size; uint32_t logical_block_size; uint32_t min_io_size; @@ -48,6 +49,8 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) } #define DEFINE_BLOCK_PROPERTIES_BASE(_state, _conf) \ + DEFINE_PROP_ON_OFF_AUTO("backend_defaults", _state, \ + _conf.backend_defaults, ON_OFF_AUTO_AUTO), \ DEFINE_PROP_BLOCKSIZE("logical_block_size", _state, \ _conf.logical_block_size), \ DEFINE_PROP_BLOCKSIZE("physical_block_size", _state, \ |