mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 23:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: Mark bdrv_query_block_graph_info() and callers GRAPH_RDLOCK

Browse Source 
This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_query_block_graph_info() need to hold a reader lock for the graph
because it accesses the children list of a node.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20230504115750.54437-19-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf
2023-05-04 13:57:48 +02:00
parent 6ec75a6a3e
commit 4f0bef8b36
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/block/qapi.h
View File

@ -25,6 +25,7 @@
#ifndef BLOCK_QAPI_H #ifndef BLOCK_QAPI_H
#define BLOCK_QAPI_H #define BLOCK_QAPI_H
#include "block/graph-lock.h"
#include "block/snapshot.h" #include "block/snapshot.h"
#include "qapi/qapi-types-block-core.h" #include "qapi/qapi-types-block-core.h"
@ -43,9 +44,9 @@ void bdrv_query_image_info(BlockDriverState *bs,
bool flat, bool flat,
bool skip_implicit_filters, bool skip_implicit_filters,
Error **errp); Error **errp);
void bdrv_query_block_graph_info(BlockDriverState *bs, void GRAPH_RDLOCK
BlockGraphInfo **p_info, bdrv_query_block_graph_info(BlockDriverState *bs, BlockGraphInfo **p_info,
Error **errp); Error **errp);
void bdrv_snapshot_dump(QEMUSnapshotInfo *sn); void bdrv_snapshot_dump(QEMUSnapshotInfo *sn);
void bdrv_image_info_specific_dump(ImageInfoSpecific *info_spec, void bdrv_image_info_specific_dump(ImageInfoSpecific *info_spec,

2
qemu-img.c
View File

@ -2938,6 +2938,8 @@ static BlockGraphInfoList *collect_image_info_list(bool image_opts,
} }
bs = blk_bs(blk); bs = blk_bs(blk);
GRAPH_RDLOCK_GUARD_MAINLOOP();
/* /*
* Note that the returned BlockGraphInfo object will not have * Note that the returned BlockGraphInfo object will not have
* information about this image's backing node, because we have opened * information about this image's backing node, because we have opened