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

block: Add blkdebug hook for copy-on-read

Browse Source 
Make it possible to inject errors on writes performed during a
read operation due to copy-on-read semantics.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Eric Blake 2017-10-05 14:02:46 -05:00 committed by Kevin Wolf
parent 8803714b53
commit d855ebcd3c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block/io.c
View File

@ -983,6 +983,7 @@ static int coroutine_fn bdrv_co_do_copy_on_readv(BdrvChild *child,
goto err; goto err;
} }
bdrv_debug_event(bs, BLKDBG_COR_WRITE);
if (drv->bdrv_co_pwrite_zeroes && if (drv->bdrv_co_pwrite_zeroes &&
buffer_is_zero(bounce_buffer, iov.iov_len)) { buffer_is_zero(bounce_buffer, iov.iov_len)) {
/* FIXME: Should we (perhaps conditionally) be setting /* FIXME: Should we (perhaps conditionally) be setting

5
qapi/block-core.json
View File

@ -2538,6 +2538,8 @@
# #
# @l1_shrink_free_l2_clusters: discard the l2 tables. (since 2.11) # @l1_shrink_free_l2_clusters: discard the l2 tables. (since 2.11)
# #
# @cor_write: a write due to copy-on-read (since 2.11)
#
# Since: 2.9 # Since: 2.9
## ##
{ 'enum': 'BlkdebugEvent', 'prefix': 'BLKDBG', { 'enum': 'BlkdebugEvent', 'prefix': 'BLKDBG',
@ -2555,7 +2557,8 @@
'flush_to_disk', 'pwritev_rmw_head', 'pwritev_rmw_after_head', 'flush_to_disk', 'pwritev_rmw_head', 'pwritev_rmw_after_head',
'pwritev_rmw_tail', 'pwritev_rmw_after_tail', 'pwritev', 'pwritev_rmw_tail', 'pwritev_rmw_after_tail', 'pwritev',
'pwritev_zero', 'pwritev_done', 'empty_image_prepare', 'pwritev_zero', 'pwritev_done', 'empty_image_prepare',
'l1_shrink_write_table', 'l1_shrink_free_l2_clusters' ] } 'l1_shrink_write_table', 'l1_shrink_free_l2_clusters',
'cor_write'] }
## ##
# @BlkdebugInjectErrorOptions: # @BlkdebugInjectErrorOptions: