* [PATCH for-9.1] migration: Add Error** argument to add_bitmaps_to_list()
@ 2024-03-29 10:56 Cédric Le Goater
2024-03-29 12:51 ` Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Cédric Le Goater @ 2024-03-29 10:56 UTC (permalink / raw
To: Eric Blake, Vladimir Sementsov-Ogievskiy, John Snow,
Stefan Hajnoczi, Fam Zheng, Peter Xu, Fabiano Rosas
Cc: Cédric Le Goater, qemu-block, qemu-devel
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>
---
To apply on top of :
https://lore.kernel.org/qemu-devel/20240320064911.545001-1-clg@redhat.com/
migration/block-dirty-bitmap.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 542a8c297b329abc30d1b3a205d29340fa59a961..a7d55048c23505fde565ca784cec3c917dca37e5 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -481,13 +481,13 @@ static void dirty_bitmap_do_save_cleanup(DBMSaveState *s)
/* Called with the BQL taken. */
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;
SaveBitmapState *dbms;
GHashTable *bitmap_aliases;
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 */
assert(!alias_map || !strcmp(bs_name, bdrv_get_node_name(bs)));
@@ -504,8 +504,8 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
bitmap_name = bdrv_dirty_bitmap_name(bitmap);
if (!bs_name || strcmp(bs_name, "") == 0) {
- error_report("Bitmap '%s' in unnamed node can't be migrated",
- bitmap_name);
+ error_setg(errp, "Bitmap '%s' in unnamed node can't be migrated",
+ bitmap_name);
return -1;
}
@@ -525,9 +525,9 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
}
if (node_alias[0] == '#') {
- error_report("Bitmap '%s' in a node with auto-generated "
- "name '%s' can't be migrated",
- bitmap_name, node_alias);
+ error_setg(errp, "Bitmap '%s' in a node with auto-generated "
+ "name '%s' can't be migrated",
+ bitmap_name, node_alias);
return -1;
}
@@ -538,8 +538,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
continue;
}
- if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_err)) {
- error_report_err(local_err);
+ if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, errp)) {
return -1;
}
@@ -558,9 +557,9 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
}
} else {
if (strlen(bitmap_name) > UINT8_MAX) {
- error_report("Cannot migrate bitmap '%s' on node '%s': "
- "Name is longer than %u bytes",
- bitmap_name, bs_name, UINT8_MAX);
+ error_setg(errp, "Cannot migrate bitmap '%s' on node '%s': "
+ "Name is longer than %u bytes",
+ bitmap_name, bs_name, UINT8_MAX);
return -1;
}
bitmap_alias = bitmap_name;
@@ -599,7 +598,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
}
/* 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;
SaveBitmapState *dbms;
@@ -643,7 +642,7 @@ static int init_dirty_bitmap_migration(DBMSaveState *s)
}
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;
}
g_hash_table_add(handled_by_blk, bs);
@@ -656,7 +655,8 @@ static int init_dirty_bitmap_migration(DBMSaveState *s)
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;
}
}
@@ -1218,9 +1218,7 @@ static int dirty_bitmap_save_setup(QEMUFile *f, void *opaque, Error **errp)
DBMSaveState *s = &((DBMState *)opaque)->save;
SaveBitmapState *dbms = NULL;
- if (init_dirty_bitmap_migration(s) < 0) {
- error_setg(errp,
- "Failed to initialize dirty tracking bitmap for blocks");
+ if (init_dirty_bitmap_migration(s, errp) < 0) {
return -1;
}
--
2.44.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH for-9.1] migration: Add Error** argument to add_bitmaps_to_list()
2024-03-29 10:56 [PATCH for-9.1] migration: Add Error** argument to add_bitmaps_to_list() Cédric Le Goater
@ 2024-03-29 12:51 ` Philippe Mathieu-Daudé
2024-03-29 19:10 ` Vladimir Sementsov-Ogievskiy
2024-04-01 14:06 ` Peter Xu
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-03-29 12:51 UTC (permalink / raw
To: Cédric Le Goater, Eric Blake, Vladimir Sementsov-Ogievskiy,
John Snow, Stefan Hajnoczi, Fam Zheng, Peter Xu, Fabiano Rosas
Cc: qemu-block, qemu-devel
On 29/3/24 11:56, Cédric Le Goater wrote:
> 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>
> ---
>
> To apply on top of :
> https://lore.kernel.org/qemu-devel/20240320064911.545001-1-clg@redhat.com/
>
> migration/block-dirty-bitmap.c | 34 ++++++++++++++++------------------
> 1 file changed, 16 insertions(+), 18 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH for-9.1] migration: Add Error** argument to add_bitmaps_to_list()
2024-03-29 10:56 [PATCH for-9.1] migration: Add Error** argument to add_bitmaps_to_list() Cédric Le Goater
2024-03-29 12:51 ` Philippe Mathieu-Daudé
@ 2024-03-29 19:10 ` Vladimir Sementsov-Ogievskiy
2024-04-01 14:06 ` Peter Xu
2 siblings, 0 replies; 4+ messages in thread
From: Vladimir Sementsov-Ogievskiy @ 2024-03-29 19:10 UTC (permalink / raw
To: Cédric Le Goater, Eric Blake, John Snow, Stefan Hajnoczi,
Fam Zheng, Peter Xu, Fabiano Rosas
Cc: qemu-block, qemu-devel
On 29.03.24 13:56, Cédric Le Goater wrote:
> 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: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
--
Best regards,
Vladimir
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH for-9.1] migration: Add Error** argument to add_bitmaps_to_list()
2024-03-29 10:56 [PATCH for-9.1] migration: Add Error** argument to add_bitmaps_to_list() Cédric Le Goater
2024-03-29 12:51 ` Philippe Mathieu-Daudé
2024-03-29 19:10 ` Vladimir Sementsov-Ogievskiy
@ 2024-04-01 14:06 ` Peter Xu
2 siblings, 0 replies; 4+ messages in thread
From: Peter Xu @ 2024-04-01 14:06 UTC (permalink / raw
To: Cédric Le Goater
Cc: Eric Blake, Vladimir Sementsov-Ogievskiy, John Snow,
Stefan Hajnoczi, Fam Zheng, Fabiano Rosas, qemu-block, qemu-devel
On Fri, Mar 29, 2024 at 11:56:27AM +0100, Cédric Le Goater wrote:
> 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>
> ---
>
> To apply on top of :
> https://lore.kernel.org/qemu-devel/20240320064911.545001-1-clg@redhat.com/
queued, thanks.
--
Peter Xu
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-01 14:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-29 10:56 [PATCH for-9.1] migration: Add Error** argument to add_bitmaps_to_list() Cédric Le Goater
2024-03-29 12:51 ` Philippe Mathieu-Daudé
2024-03-29 19:10 ` Vladimir Sementsov-Ogievskiy
2024-04-01 14:06 ` Peter Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.