[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 07/19] blkverify: Implement .bdrv_recurse_can_replace()
From: |
Max Reitz |
Subject: |
[PATCH v4 07/19] blkverify: Implement .bdrv_recurse_can_replace() |
Date: |
Tue, 18 Feb 2020 11:34:42 +0100 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/blkverify.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/block/blkverify.c b/block/blkverify.c
index 304b0a1368..0add3ab483 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -282,6 +282,20 @@ static bool
blkverify_recurse_is_first_non_filter(BlockDriverState *bs,
return bdrv_recurse_is_first_non_filter(s->test_file->bs, candidate);
}
+static bool blkverify_recurse_can_replace(BlockDriverState *bs,
+ BlockDriverState *to_replace)
+{
+ BDRVBlkverifyState *s = bs->opaque;
+
+ /*
+ * blkverify quits the whole qemu process if there is a mismatch
+ * between bs->file->bs and s->test_file->bs. Therefore, we know
+ * know that both must match bs and we can recurse down to either.
+ */
+ return bdrv_recurse_can_replace(bs->file->bs, to_replace) ||
+ bdrv_recurse_can_replace(s->test_file->bs, to_replace);
+}
+
static void blkverify_refresh_filename(BlockDriverState *bs)
{
BDRVBlkverifyState *s = bs->opaque;
@@ -328,6 +342,7 @@ static BlockDriver bdrv_blkverify = {
.is_filter = true,
.bdrv_recurse_is_first_non_filter = blkverify_recurse_is_first_non_filter,
+ .bdrv_recurse_can_replace = blkverify_recurse_can_replace,
};
static void bdrv_blkverify_init(void)
--
2.24.1
- [PATCH v4 00/19] block: Fix check_to_replace_node(), Max Reitz, 2020/02/18
- [PATCH v4 01/19] blockdev: Allow external snapshots everywhere, Max Reitz, 2020/02/18
- [PATCH v4 02/19] blockdev: Allow resizing everywhere, Max Reitz, 2020/02/18
- [PATCH v4 03/19] block: Drop bdrv_is_first_non_filter(), Max Reitz, 2020/02/18
- [PATCH v4 04/19] iotests: Let 041 use -blockdev for quorum children, Max Reitz, 2020/02/18
- [PATCH v4 05/19] quorum: Fix child permissions, Max Reitz, 2020/02/18
- [PATCH v4 06/19] block: Add bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 07/19] blkverify: Implement .bdrv_recurse_can_replace(),
Max Reitz <=
- [PATCH v4 08/19] quorum: Implement .bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 09/19] block: Use bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 10/19] block: Remove bdrv_recurse_is_first_non_filter(), Max Reitz, 2020/02/18
- [PATCH v4 12/19] quorum: Stop marking it as a filter, Max Reitz, 2020/02/18
- [PATCH v4 11/19] mirror: Double-check immediately before replacing, Max Reitz, 2020/02/18
- [PATCH v4 13/19] iotests: Use complete_and_wait() in 155, Max Reitz, 2020/02/18
- [PATCH v4 14/19] iotests: Add VM.assert_block_path(), Max Reitz, 2020/02/18
- [PATCH v4 16/19] iotests: Resolve TODOs in 041, Max Reitz, 2020/02/18
- [PATCH v4 15/19] iotests/041: Drop superfluous shutdowns, Max Reitz, 2020/02/18
- [PATCH v4 17/19] iotests: Use self.image_len in TestRepairQuorum, Max Reitz, 2020/02/18