[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 5/6] migration/block-dirty-bitmap: add_bitmaps_to_list: check
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v4 5/6] migration/block-dirty-bitmap: add_bitmaps_to_list: check disk name once |
Date: |
Fri, 22 May 2020 01:06:47 +0300 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Andrey Shinkevich <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
migration/block-dirty-bitmap.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 04a5525fd1..65f2948f07 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -274,17 +274,22 @@ static int add_bitmaps_to_list(BlockDriverState *bs,
const char *bs_name)
DirtyBitmapMigBitmapState *dbms;
Error *local_err = NULL;
+ bitmap = bdrv_dirty_bitmap_first(bs);
+ if (!bitmap) {
+ return 0;
+ }
+
+ if (!bs_name || strcmp(bs_name, "") == 0) {
+ error_report("Bitmap '%s' in unnamed node can't be migrated",
+ bdrv_dirty_bitmap_name(bitmap));
+ return -1;
+ }
+
FOR_EACH_DIRTY_BITMAP(bs, bitmap) {
if (!bdrv_dirty_bitmap_name(bitmap)) {
continue;
}
- if (!bs_name || strcmp(bs_name, "") == 0) {
- error_report("Found bitmap '%s' in unnamed node %p. It can't "
- "be migrated", bdrv_dirty_bitmap_name(bitmap), bs);
- return -1;
- }
-
if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_err)) {
error_report_err(local_err);
return -1;
--
2.21.0
- [PATCH v4 0/6] fix migration with bitmaps and mirror, Vladimir Sementsov-Ogievskiy, 2020/05/21
- [PATCH v4 1/6] migration/block-dirty-bitmap: refactor init_dirty_bitmap_migration, Vladimir Sementsov-Ogievskiy, 2020/05/21
- [PATCH v4 2/6] block/dirty-bitmap: add bdrv_has_named_bitmaps helper, Vladimir Sementsov-Ogievskiy, 2020/05/21
- [PATCH v4 3/6] migration/block-dirty-bitmap: fix bitmaps pre-blockdev migration during mirror job, Vladimir Sementsov-Ogievskiy, 2020/05/21
- [PATCH v4 4/6] iotests: 194: test also migration of dirty bitmap, Vladimir Sementsov-Ogievskiy, 2020/05/21
- [PATCH v4 5/6] migration/block-dirty-bitmap: add_bitmaps_to_list: check disk name once,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v4 6/6] migration/block-dirty-bitmap: forbid migration by generated node-name, Vladimir Sementsov-Ogievskiy, 2020/05/21
- Re: [PATCH v4 0/6] fix migration with bitmaps and mirror, Eric Blake, 2020/05/22