motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 09:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: Mark bdrv_amend_options() and callers GRAPH_RDLOCK

Browse source 
This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_amend_options() need to hold a reader lock for the graph. This
removes an assume_graph_lock() call in crypto's implementation.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-14-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2023-09-29 16:51:48 +02:00
parent 4026f1c4f3
commit bd131d6705
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qemu-img.c
View file

@ -4129,6 +4129,8 @@ static int print_amend_option_help(const char *format)
{
BlockDriver *drv;
GRAPH_RDLOCK_GUARD_MAINLOOP();
/* Find driver and parse its options */
drv = bdrv_find_format(format);
if (!drv) {
@ -4267,9 +4269,11 @@ static int img_amend(int argc, char **argv)
goto out;
}
bdrv_graph_rdlock_main_loop();
if (!bs->drv->bdrv_amend_options) {
error_report("Format driver '%s' does not support option amendment",
fmt);
bdrv_graph_rdunlock_main_loop();
ret = -1;
goto out;
}
@ -4289,6 +4293,7 @@ static int img_amend(int argc, char **argv)
"This option is only supported for image creation\n");
}
bdrv_graph_rdunlock_main_loop();
error_report_err(err);
ret = -1;
goto out;
@ -4298,6 +4303,8 @@ static int img_amend(int argc, char **argv)
qemu_progress_print(0.f, 0);
ret = bdrv_amend_options(bs, opts, &amend_status_cb, NULL, force, &err);
qemu_progress_print(100.f, 0);
bdrv_graph_rdunlock_main_loop();
if (ret < 0) {
error_report_err(err);
goto out;