mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Update comments on BDRV_BLOCK_* meanings

Browse Source 
We had some conflicting documentation: a nice 8-way table that
described all possible combinations of DATA, ZERO, and
OFFSET_VALID, contrasted with text that implied that OFFSET_VALID
always meant raw data could be read directly.  Furthermore, the
text refers a lot to bs->file, even though the interface was
updated back in 67a0fd2a to let the driver pass back a specific
BDS (not necessarily bs->file).  As the 8-way table is the
intended semantics, simplify the rest of the text to get rid of
the confusion.

ALLOCATED is always set by the block layer for convenience (drivers
do not have to worry about it).  RAW is used only internally, but
by more than the raw driver.  Document these additional items on
the driver callback.

Suggested-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20170507000552.20847-4-eblake@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Eric Blake 2017-05-06 19:05:43 -05:00 committed by Max Reitz
parent bbd995d830
commit 4c41cb4955
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/block/block.h
View File

@ -121,29 +121,32 @@ typedef struct HDGeometry {
#define BDRV_REQUEST_MAX_BYTES (BDRV_REQUEST_MAX_SECTORS << BDRV_SECTOR_BITS) #define BDRV_REQUEST_MAX_BYTES (BDRV_REQUEST_MAX_SECTORS << BDRV_SECTOR_BITS)
/* /*
* Allocation status flags * Allocation status flags for bdrv_get_block_status() and friends.
* BDRV_BLOCK_DATA: data is read from a file returned by bdrv_get_block_status. *
* BDRV_BLOCK_ZERO: sectors read as zero * Public flags:
* BDRV_BLOCK_OFFSET_VALID: sector stored as raw data in a file returned by * BDRV_BLOCK_DATA: allocation for data at offset is tied to this layer
* bdrv_get_block_status. * BDRV_BLOCK_ZERO: offset reads as zero
* BDRV_BLOCK_OFFSET_VALID: an associated offset exists for accessing raw data
* BDRV_BLOCK_ALLOCATED: the content of the block is determined by this * BDRV_BLOCK_ALLOCATED: the content of the block is determined by this
* layer (as opposed to the backing file) * layer (short for DATA || ZERO), set by block layer
* BDRV_BLOCK_RAW: used internally to indicate that the request
* was answered by the raw driver and that one
* should look in bs->file directly.
* *
* If BDRV_BLOCK_OFFSET_VALID is set, bits 9-62 represent the offset in * Internal flag:
* bs->file where sector data can be read from as raw data. * BDRV_BLOCK_RAW: used internally to indicate that the request was
* answered by a passthrough driver such as raw and that the
* block layer should recompute the answer from bs->file.
* *
* DATA == 0 && ZERO == 0 means that data is read from backing_hd if present. * If BDRV_BLOCK_OFFSET_VALID is set, bits 9-62 (BDRV_BLOCK_OFFSET_MASK)
* represent the offset in the returned BDS that is allocated for the
* corresponding raw data; however, whether that offset actually contains
* data also depends on BDRV_BLOCK_DATA and BDRV_BLOCK_ZERO, as follows:
* *
* DATA ZERO OFFSET_VALID * DATA ZERO OFFSET_VALID
* t t t sectors read as zero, bs->file is zero at offset * t t t sectors read as zero, returned file is zero at offset
* t f t sectors read as valid from bs->file at offset * t f t sectors read as valid from file at offset
* f t t sectors preallocated, read as zero, bs->file not * f t t sectors preallocated, read as zero, returned file not
* necessarily zero at offset * necessarily zero at offset
* f f t sectors preallocated but read from backing_hd, * f f t sectors preallocated but read from backing_hd,
* bs->file contains garbage at offset * returned file contains garbage at offset
* t t f sectors preallocated, read as zero, unknown offset * t t f sectors preallocated, read as zero, unknown offset
* t f f sectors read from unknown file or offset * t f f sectors read from unknown file or offset
* f t f not allocated or unknown offset, read as zero * f t f not allocated or unknown offset, read as zero

7
include/block/block_int.h
View File

@ -165,6 +165,13 @@ struct BlockDriver {
int64_t offset, int count, BdrvRequestFlags flags); int64_t offset, int count, BdrvRequestFlags flags);
int coroutine_fn (*bdrv_co_pdiscard)(BlockDriverState *bs, int coroutine_fn (*bdrv_co_pdiscard)(BlockDriverState *bs,
int64_t offset, int count); int64_t offset, int count);
/*
* Building block for bdrv_block_status[_above]. The driver should
* answer only according to the current layer, and should not
* set BDRV_BLOCK_ALLOCATED, but may set BDRV_BLOCK_RAW. See block.h
* for the meaning of _DATA, _ZERO, and _OFFSET_VALID.
*/
int64_t coroutine_fn (*bdrv_co_get_block_status)(BlockDriverState *bs, int64_t coroutine_fn (*bdrv_co_get_block_status)(BlockDriverState *bs,
int64_t sector_num, int nb_sectors, int *pnum, int64_t sector_num, int nb_sectors, int *pnum,
BlockDriverState **file); BlockDriverState **file);