SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration: Add Error** argument to add_bitmaps_to_list()

Browse Source 
This allows to report more precise errors in the migration handler
dirty_bitmap_save_setup().

Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Link: https://lore.kernel.org/r/20240329105627.311227-1-clg@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Cédric Le Goater 2024-03-29 11:56:27 +01:00 committed by Peter Xu
parent 030b56b280
commit dd03167725
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
migration/block-dirty-bitmap.c
View File

@ -481,13 +481,13 @@ static void dirty_bitmap_do_save_cleanup(DBMSaveState *s)
/* Called with the BQL taken. */ /* Called with the BQL taken. */
static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs, static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
const char *bs_name, GHashTable *alias_map) const char *bs_name, GHashTable *alias_map,
Error **errp)
{ {
BdrvDirtyBitmap *bitmap; BdrvDirtyBitmap *bitmap;
SaveBitmapState *dbms; SaveBitmapState *dbms;
GHashTable *bitmap_aliases; GHashTable *bitmap_aliases;
const char *node_alias, *bitmap_name, *bitmap_alias; const char *node_alias, *bitmap_name, *bitmap_alias;
Error *local_err = NULL;
/* When an alias map is given, @bs_name must be @bs's node name */ /* When an alias map is given, @bs_name must be @bs's node name */
assert(!alias_map || !strcmp(bs_name, bdrv_get_node_name(bs))); assert(!alias_map || !strcmp(bs_name, bdrv_get_node_name(bs)));
@ -504,7 +504,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
bitmap_name = bdrv_dirty_bitmap_name(bitmap); bitmap_name = bdrv_dirty_bitmap_name(bitmap);
if (!bs_name || strcmp(bs_name, "") == 0) { if (!bs_name || strcmp(bs_name, "") == 0) {
error_report("Bitmap '%s' in unnamed node can't be migrated", error_setg(errp, "Bitmap '%s' in unnamed node can't be migrated",
bitmap_name); bitmap_name);
return -1; return -1;
} }
@ -525,7 +525,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
} }
if (node_alias[0] == '#') { if (node_alias[0] == '#') {
error_report("Bitmap '%s' in a node with auto-generated " error_setg(errp, "Bitmap '%s' in a node with auto-generated "
"name '%s' can't be migrated", "name '%s' can't be migrated",
bitmap_name, node_alias); bitmap_name, node_alias);
return -1; return -1;
@ -538,8 +538,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
continue; continue;
} }
if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_err)) { if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, errp)) {
error_report_err(local_err);
return -1; return -1;
} }
@ -558,7 +557,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
} }
} else { } else {
if (strlen(bitmap_name) > UINT8_MAX) { if (strlen(bitmap_name) > UINT8_MAX) {
error_report("Cannot migrate bitmap '%s' on node '%s': " error_setg(errp, "Cannot migrate bitmap '%s' on node '%s': "
"Name is longer than %u bytes", "Name is longer than %u bytes",
bitmap_name, bs_name, UINT8_MAX); bitmap_name, bs_name, UINT8_MAX);
return -1; return -1;
@ -599,7 +598,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
} }
/* Called with the BQL taken. */ /* Called with the BQL taken. */
static int init_dirty_bitmap_migration(DBMSaveState *s) static int init_dirty_bitmap_migration(DBMSaveState *s, Error **errp)
{ {
BlockDriverState *bs; BlockDriverState *bs;
SaveBitmapState *dbms; SaveBitmapState *dbms;
@ -643,7 +642,7 @@ static int init_dirty_bitmap_migration(DBMSaveState *s)
} }
if (bs && bs->drv && !bs->drv->is_filter) { if (bs && bs->drv && !bs->drv->is_filter) {
if (add_bitmaps_to_list(s, bs, name, NULL)) { if (add_bitmaps_to_list(s, bs, name, NULL, errp)) {
goto fail; goto fail;
} }
g_hash_table_add(handled_by_blk, bs); g_hash_table_add(handled_by_blk, bs);
@ -656,7 +655,8 @@ static int init_dirty_bitmap_migration(DBMSaveState *s)
continue; continue;
} }
if (add_bitmaps_to_list(s, bs, bdrv_get_node_name(bs), alias_map)) { if (add_bitmaps_to_list(s, bs, bdrv_get_node_name(bs), alias_map,
errp)) {
goto fail; goto fail;
} }
} }
@ -1218,9 +1218,7 @@ static int dirty_bitmap_save_setup(QEMUFile *f, void *opaque, Error **errp)
DBMSaveState *s = &((DBMState *)opaque)->save; DBMSaveState *s = &((DBMState *)opaque)->save;
SaveBitmapState *dbms = NULL; SaveBitmapState *dbms = NULL;
if (init_dirty_bitmap_migration(s) < 0) { if (init_dirty_bitmap_migration(s, errp) < 0) {
error_setg(errp,
"Failed to initialize dirty tracking bitmap for blocks");
return -1; return -1;
} }