diff options
| author | Peter Maydell | 2017-06-30 17:29:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-06-30 17:29:51 +0200 |
| commit | 82d76dc7fc19a5eb9f731d7faed1792bb97214e0 (patch) | |
| tree | 264c6521046007c6bd8ea2358c06b75a22371e85 /include | |
| parent | Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.10-pull-request'... (diff) | |
| parent | block: Exploit BDRV_BLOCK_EOF for larger zero blocks (diff) | |
| download | qemu-82d76dc7fc19a5eb9f731d7faed1792bb97214e0.tar.gz qemu-82d76dc7fc19a5eb9f731d7faed1792bb97214e0.tar.xz qemu-82d76dc7fc19a5eb9f731d7faed1792bb97214e0.zip | |
Merge remote-tracking branch 'remotes/famz/tags/block-pull-request' into staging
# gpg: Signature made Fri 30 Jun 2017 15:08:45 BST
# gpg: using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/block-pull-request:
block: Exploit BDRV_BLOCK_EOF for larger zero blocks
block: Add BDRV_BLOCK_EOF to bdrv_get_block_status()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/block/block.h b/include/block/block.h index 85e4be7462..4c149adb17 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -129,6 +129,7 @@ typedef struct HDGeometry { * BDRV_BLOCK_OFFSET_VALID: an associated offset exists for accessing raw data * BDRV_BLOCK_ALLOCATED: the content of the block is determined by this * layer (short for DATA || ZERO), set by block layer + * BDRV_BLOCK_EOF: the returned pnum covers through end of file for this layer * * Internal flag: * BDRV_BLOCK_RAW: used internally to indicate that the request was @@ -157,6 +158,7 @@ typedef struct HDGeometry { #define BDRV_BLOCK_OFFSET_VALID 0x04 #define BDRV_BLOCK_RAW 0x08 #define BDRV_BLOCK_ALLOCATED 0x10 +#define BDRV_BLOCK_EOF 0x20 #define BDRV_BLOCK_OFFSET_MASK BDRV_SECTOR_MASK typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue; |