From: Max Reitz <mreitz@redhat.com> To: qemu-block@nongnu.org Cc: Kevin Wolf <kwolf@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>, qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v6 34/42] block: Inline bdrv_co_block_status_from_*() Date: Fri, 9 Aug 2019 18:13:59 +0200 Message-ID: <20190809161407.11920-35-mreitz@redhat.com> (raw) In-Reply-To: <20190809161407.11920-1-mreitz@redhat.com> With bdrv_filtered_rw_bs(), we can easily handle this default filter behavior in bdrv_co_block_status(). blkdebug wants to have an additional assertion, so it keeps its own implementation, except bdrv_co_block_status_from_file() needs to be inlined there. Suggested-by: Eric Blake <eblake@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- include/block/block_int.h | 22 ----------------- block/blkdebug.c | 7 ++++-- block/blklogwrites.c | 1 - block/commit.c | 1 - block/copy-on-read.c | 2 -- block/io.c | 51 +++++++++++++-------------------------- block/mirror.c | 1 - block/throttle.c | 1 - 8 files changed, 22 insertions(+), 64 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index c17df3808a..42ee2fcf7f 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -1227,28 +1227,6 @@ void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nshared); -/* - * Default implementation for drivers to pass bdrv_co_block_status() to - * their file. - */ -int coroutine_fn bdrv_co_block_status_from_file(BlockDriverState *bs, - bool want_zero, - int64_t offset, - int64_t bytes, - int64_t *pnum, - int64_t *map, - BlockDriverState **file); -/* - * Default implementation for drivers to pass bdrv_co_block_status() to - * their backing file. - */ -int coroutine_fn bdrv_co_block_status_from_backing(BlockDriverState *bs, - bool want_zero, - int64_t offset, - int64_t bytes, - int64_t *pnum, - int64_t *map, - BlockDriverState **file); const char *bdrv_get_parent_name(const BlockDriverState *bs); void blk_dev_change_media_cb(BlockBackend *blk, bool load, Error **errp); bool blk_dev_has_removable_media(BlockBackend *blk); diff --git a/block/blkdebug.c b/block/blkdebug.c index 5ae96c52b0..0011e068ce 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -679,8 +679,11 @@ static int coroutine_fn blkdebug_co_block_status(BlockDriverState *bs, return err; } - return bdrv_co_block_status_from_file(bs, want_zero, offset, bytes, - pnum, map, file); + assert(bs->file && bs->file->bs); + *pnum = bytes; + *map = offset; + *file = bs->file->bs; + return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID; } static void blkdebug_close(BlockDriverState *bs) diff --git a/block/blklogwrites.c b/block/blklogwrites.c index 04d8b33607..8982fd15c4 100644 --- a/block/blklogwrites.c +++ b/block/blklogwrites.c @@ -519,7 +519,6 @@ static BlockDriver bdrv_blk_log_writes = { .bdrv_co_pwrite_zeroes = blk_log_writes_co_pwrite_zeroes, .bdrv_co_flush_to_disk = blk_log_writes_co_flush_to_disk, .bdrv_co_pdiscard = blk_log_writes_co_pdiscard, - .bdrv_co_block_status = bdrv_co_block_status_from_file, .is_filter = true, .strong_runtime_opts = blk_log_writes_strong_runtime_opts, diff --git a/block/commit.c b/block/commit.c index 40d1c8eeac..c94678bea3 100644 --- a/block/commit.c +++ b/block/commit.c @@ -252,7 +252,6 @@ static void bdrv_commit_top_child_perm(BlockDriverState *bs, BdrvChild *c, static BlockDriver bdrv_commit_top = { .format_name = "commit_top", .bdrv_co_preadv = bdrv_commit_top_preadv, - .bdrv_co_block_status = bdrv_co_block_status_from_backing, .bdrv_refresh_filename = bdrv_commit_top_refresh_filename, .bdrv_child_perm = bdrv_commit_top_child_perm, diff --git a/block/copy-on-read.c b/block/copy-on-read.c index 16bdf630b6..ad6577d078 100644 --- a/block/copy-on-read.c +++ b/block/copy-on-read.c @@ -160,8 +160,6 @@ static BlockDriver bdrv_copy_on_read = { .bdrv_eject = cor_eject, .bdrv_lock_medium = cor_lock_medium, - .bdrv_co_block_status = bdrv_co_block_status_from_file, - .bdrv_recurse_is_first_non_filter = cor_recurse_is_first_non_filter, .has_variable_length = true, diff --git a/block/io.c b/block/io.c index e222d91893..d7d9757f46 100644 --- a/block/io.c +++ b/block/io.c @@ -2028,36 +2028,6 @@ typedef struct BdrvCoBlockStatusData { bool done; } BdrvCoBlockStatusData; -int coroutine_fn bdrv_co_block_status_from_file(BlockDriverState *bs, - bool want_zero, - int64_t offset, - int64_t bytes, - int64_t *pnum, - int64_t *map, - BlockDriverState **file) -{ - assert(bs->file && bs->file->bs); - *pnum = bytes; - *map = offset; - *file = bs->file->bs; - return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID; -} - -int coroutine_fn bdrv_co_block_status_from_backing(BlockDriverState *bs, - bool want_zero, - int64_t offset, - int64_t bytes, - int64_t *pnum, - int64_t *map, - BlockDriverState **file) -{ - assert(bs->backing && bs->backing->bs); - *pnum = bytes; - *map = offset; - *file = bs->backing->bs; - return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID; -} - /* * Returns the allocation status of the specified sectors. * Drivers not implementing the functionality are assumed to not support @@ -2098,6 +2068,7 @@ static int coroutine_fn bdrv_co_block_status(BlockDriverState *bs, BlockDriverState *local_file = NULL; int64_t aligned_offset, aligned_bytes; uint32_t align; + bool has_filtered_child; assert(pnum); *pnum = 0; @@ -2123,7 +2094,8 @@ static int coroutine_fn bdrv_co_block_status(BlockDriverState *bs, /* Must be non-NULL or bdrv_getlength() would have failed */ assert(bs->drv); - if (!bs->drv->bdrv_co_block_status) { + has_filtered_child = bs->drv->is_filter && bdrv_filtered_rw_child(bs); + if (!bs->drv->bdrv_co_block_status && !has_filtered_child) { *pnum = bytes; ret = BDRV_BLOCK_DATA | BDRV_BLOCK_ALLOCATED; if (offset + bytes == total_size) { @@ -2144,9 +2116,20 @@ static int coroutine_fn bdrv_co_block_status(BlockDriverState *bs, aligned_offset = QEMU_ALIGN_DOWN(offset, align); aligned_bytes = ROUND_UP(offset + bytes, align) - aligned_offset; - ret = bs->drv->bdrv_co_block_status(bs, want_zero, aligned_offset, - aligned_bytes, pnum, &local_map, - &local_file); + if (bs->drv->bdrv_co_block_status) { + ret = bs->drv->bdrv_co_block_status(bs, want_zero, aligned_offset, + aligned_bytes, pnum, &local_map, + &local_file); + } else { + /* Default code for filters */ + + local_file = bdrv_filtered_rw_bs(bs); + assert(local_file); + + *pnum = aligned_bytes; + local_map = aligned_offset; + ret = BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID; + } if (ret < 0) { *pnum = 0; goto out; diff --git a/block/mirror.c b/block/mirror.c index 6ddbfb9708..88155faaec 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1508,7 +1508,6 @@ static BlockDriver bdrv_mirror_top = { .bdrv_co_pwrite_zeroes = bdrv_mirror_top_pwrite_zeroes, .bdrv_co_pdiscard = bdrv_mirror_top_pdiscard, .bdrv_co_flush = bdrv_mirror_top_flush, - .bdrv_co_block_status = bdrv_co_block_status_from_backing, .bdrv_refresh_filename = bdrv_mirror_top_refresh_filename, .bdrv_child_perm = bdrv_mirror_top_child_perm, .bdrv_refresh_limits = bdrv_mirror_top_refresh_limits, diff --git a/block/throttle.c b/block/throttle.c index 958a2bcfa6..d0436f875b 100644 --- a/block/throttle.c +++ b/block/throttle.c @@ -270,7 +270,6 @@ static BlockDriver bdrv_throttle = { .bdrv_reopen_prepare = throttle_reopen_prepare, .bdrv_reopen_commit = throttle_reopen_commit, .bdrv_reopen_abort = throttle_reopen_abort, - .bdrv_co_block_status = bdrv_co_block_status_from_file, .bdrv_co_drain_begin = throttle_co_drain_begin, .bdrv_co_drain_end = throttle_co_drain_end, -- 2.21.0
next prev parent reply index Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-09 16:13 [Qemu-devel] [PATCH v6 00/42] block: Deal with filters Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 01/42] block: Mark commit and mirror as filter drivers Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 02/42] copy-on-read: Support compressed writes Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 03/42] throttle: " Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 04/42] block: Add child access functions Max Reitz 2019-08-09 16:56 ` Eric Blake 2019-09-04 16:16 ` Kevin Wolf 2019-09-09 7:56 ` Max Reitz 2019-09-09 9:36 ` Kevin Wolf 2019-09-09 14:04 ` Max Reitz 2019-09-09 16:13 ` Kevin Wolf 2019-09-10 9:14 ` Max Reitz 2019-09-10 10:47 ` Kevin Wolf 2019-09-10 11:36 ` Max Reitz 2019-09-10 12:48 ` Kevin Wolf 2019-09-10 12:59 ` Max Reitz 2019-09-10 13:10 ` Kevin Wolf 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 05/42] block: Add chain helper functions Max Reitz 2019-08-09 17:01 ` Eric Blake 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 06/42] qcow2: Implement .bdrv_storage_child() Max Reitz 2019-08-09 17:07 ` Eric Blake 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 07/42] block: *filtered_cow_child() for *has_zero_init() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 08/42] block: bdrv_set_backing_hd() is about bs->backing Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 09/42] block: Include filters when freezing backing chain Max Reitz 2019-08-10 13:32 ` Vladimir Sementsov-Ogievskiy 2019-08-12 12:56 ` Max Reitz 2019-09-05 13:05 ` Kevin Wolf 2019-09-09 8:02 ` Max Reitz 2019-09-09 9:40 ` Kevin Wolf 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 10/42] block: Drop bdrv_is_encrypted() Max Reitz 2019-08-10 13:42 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 11/42] block: Add bdrv_supports_compressed_writes() Max Reitz 2019-09-05 13:11 ` Kevin Wolf 2019-09-09 8:09 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 12/42] block: Use bdrv_filtered_rw* where obvious Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 13/42] block: Use CAFs in block status functions Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 14/42] block: Use CAFs when working with backing chains Max Reitz 2019-08-10 15:19 ` Vladimir Sementsov-Ogievskiy 2019-09-05 14:05 ` Kevin Wolf 2019-09-09 8:25 ` Max Reitz 2019-09-09 9:55 ` Kevin Wolf 2019-09-09 14:08 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 15/42] block: Re-evaluate backing file handling in reopen Max Reitz 2019-08-10 16:05 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 16/42] block: Flush all children in generic code Max Reitz 2019-08-10 15:36 ` Vladimir Sementsov-Ogievskiy 2019-08-12 12:58 ` Max Reitz 2019-09-05 16:24 ` Kevin Wolf 2019-09-09 8:31 ` Max Reitz 2019-09-09 10:01 ` Kevin Wolf 2019-09-09 14:15 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 17/42] block: Use CAFs in bdrv_refresh_limits() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 18/42] block: Use CAFs in bdrv_refresh_filename() Max Reitz 2019-08-10 16:22 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 19/42] block: Use CAF in bdrv_co_rw_vmstate() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 20/42] block/snapshot: Fix fallback Max Reitz 2019-08-10 16:34 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:06 ` Max Reitz 2019-09-10 11:56 ` Kevin Wolf 2019-09-10 12:04 ` Max Reitz 2019-09-10 12:49 ` Kevin Wolf 2019-09-10 13:06 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 21/42] block: Use CAFs for debug breakpoints Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 22/42] block: Fix bdrv_get_allocated_file_size's fallback Max Reitz 2019-08-10 16:41 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:09 ` Max Reitz 2019-08-12 17:14 ` Vladimir Sementsov-Ogievskiy 2019-08-12 19:15 ` Max Reitz 2019-09-10 14:52 ` Kevin Wolf 2019-09-11 6:20 ` Max Reitz 2019-09-11 6:55 ` Kevin Wolf 2019-09-11 7:37 ` Max Reitz 2019-09-11 8:27 ` Kevin Wolf 2019-09-11 10:00 ` Max Reitz 2019-09-11 10:31 ` Kevin Wolf 2019-09-11 11:00 ` Max Reitz 2019-09-12 10:34 ` Kevin Wolf 2019-11-14 13:11 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 23/42] blockdev: Use CAF in external_snapshot_prepare() Max Reitz 2019-09-10 15:02 ` Kevin Wolf 2019-09-11 6:21 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 24/42] block: Use child access functions for QAPI queries Max Reitz 2019-08-10 16:57 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 25/42] mirror: Deal with filters Max Reitz 2019-08-12 11:09 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:26 ` Max Reitz 2019-08-14 15:17 ` Vladimir Sementsov-Ogievskiy 2019-08-31 9:57 ` Vladimir Sementsov-Ogievskiy 2019-09-02 14:35 ` Max Reitz 2019-09-03 8:32 ` Vladimir Sementsov-Ogievskiy 2019-09-09 7:41 ` Max Reitz 2019-09-13 12:55 ` Kevin Wolf 2019-09-16 10:26 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 26/42] backup: " Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 27/42] commit: " Max Reitz 2019-08-31 10:44 ` Vladimir Sementsov-Ogievskiy 2019-09-02 14:55 ` Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 28/42] stream: " Max Reitz 2019-08-12 11:55 ` Vladimir Sementsov-Ogievskiy 2019-09-13 14:16 ` Kevin Wolf 2019-09-16 9:52 ` Max Reitz 2019-09-16 14:47 ` Kevin Wolf 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 29/42] nbd: Use CAF when looking for dirty bitmap Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 30/42] qemu-img: Use child access functions Max Reitz 2019-08-12 12:14 ` Vladimir Sementsov-Ogievskiy 2019-08-12 13:28 ` Max Reitz 2019-08-14 16:04 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 31/42] block: Drop backing_bs() Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 32/42] block: Make bdrv_get_cumulative_perm() public Max Reitz 2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 33/42] blockdev: Fix active commit choice Max Reitz 2019-08-09 16:13 ` Max Reitz [this message] 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 35/42] block: Fix check_to_replace_node() Max Reitz 2019-08-15 15:21 ` Vladimir Sementsov-Ogievskiy 2019-08-15 17:01 ` Max Reitz 2019-08-16 11:01 ` Vladimir Sementsov-Ogievskiy 2019-08-16 13:30 ` Max Reitz 2019-08-16 14:24 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 36/42] iotests: Add tests for mirror @replaces loops Max Reitz 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 37/42] block: Leave BDS.backing_file constant Max Reitz 2019-08-16 16:16 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 38/42] iotests: Let complete_and_wait() work with commit Max Reitz 2019-08-23 5:59 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 39/42] iotests: Add filter commit test cases Max Reitz 2019-08-31 11:41 ` Vladimir Sementsov-Ogievskiy 2019-09-02 15:06 ` Max Reitz 2019-08-31 12:35 ` Vladimir Sementsov-Ogievskiy 2019-09-02 15:09 ` Max Reitz 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 40/42] iotests: Add filter mirror " Max Reitz 2019-08-31 12:35 ` Vladimir Sementsov-Ogievskiy 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 41/42] iotests: Add test for commit in sub directory Max Reitz 2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 42/42] iotests: Test committing to overridden backing Max Reitz 2019-09-03 9:18 ` Vladimir Sementsov-Ogievskiy
Reply instructions: You may reply publically to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190809161407.11920-35-mreitz@redhat.com \ --to=mreitz@redhat.com \ --cc=kwolf@redhat.com \ --cc=qemu-block@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=vsementsov@virtuozzo.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
QEMU-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \ qemu-devel@nongnu.org public-inbox-index qemu-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git