diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-26 09:57:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-26 09:57:07 +0000 |
| commit | 527266f324def9f7f392fe3b0dd940cb8dc699d9 (patch) | |
| tree | 26137e5661167d49913a911e1e8986e8de346a8b /include/hw | |
| parent | 199f8d94be106f20dfce23fa4e157fc8d55fd494 (diff) | |
| parent | 3f905a5bba69691f1384a0464b5a7b8e516861c4 (diff) | |
| download | qemu-527266f324def9f7f392fe3b0dd940cb8dc699d9.zip qemu-527266f324def9f7f392fe3b0dd940cb8dc699d9.tar.gz qemu-527266f324def9f7f392fe3b0dd940cb8dc699d9.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-pflash-2019-03-26' into staging
Pflash and firmware configuration patches for 2019-03-26
# gpg: Signature made Tue 26 Mar 2019 07:21:13 GMT
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-pflash-2019-03-26:
pflash: Bury disabled code to limit device sizes
pflash: Require backend size to match device, improve errors
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/block/block.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/hw/block/block.h b/include/hw/block/block.h index e9f9e22..d06f25a 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -11,7 +11,7 @@ #ifndef HW_BLOCK_H #define HW_BLOCK_H -#include "qemu-common.h" +#include "exec/hwaddr.h" #include "qapi/qapi-types-block-core.h" /* Configuration */ @@ -70,6 +70,11 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) DEFINE_PROP_BLOCKDEV_ON_ERROR("werror", _state, _conf.werror, \ BLOCKDEV_ON_ERROR_AUTO) +/* Backend access helpers */ + +bool blk_check_size_and_read_all(BlockBackend *blk, void *buf, hwaddr size, + Error **errp); + /* Configuration helpers */ bool blkconf_geometry(BlockConf *conf, int *trans, |