OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qcow2: Mark check_constraints_on_bitmap() GRAPH_RDLOCK

Browse Source 
It still has an assume_graph_lock() call, but all of its callers are now
properly annotated to hold the graph lock. Update the function to be
GRAPH_RDLOCK as well and remove the assume_graph_lock().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-17-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:51 +02:00
parent de4fed6f4e
commit 5155853e90
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/qcow2-bitmap.c
View File

@ -156,18 +156,15 @@ static int64_t get_bitmap_bytes_needed(int64_t len, uint32_t granularity)
return DIV_ROUND_UP(num_bits, 8); return DIV_ROUND_UP(num_bits, 8);
} }
static int check_constraints_on_bitmap(BlockDriverState *bs, static int GRAPH_RDLOCK
const char *name, check_constraints_on_bitmap(BlockDriverState *bs, const char *name,
uint32_t granularity, uint32_t granularity, Error **errp)
Error **errp)
{ {
BDRVQcow2State *s = bs->opaque; BDRVQcow2State *s = bs->opaque;
int granularity_bits = ctz32(granularity); int granularity_bits = ctz32(granularity);
int64_t len = bdrv_getlength(bs); int64_t len = bdrv_getlength(bs);
int64_t bitmap_bytes; int64_t bitmap_bytes;
assume_graph_lock(); /* FIXME */
assert(granularity > 0); assert(granularity > 0);
assert((granularity & (granularity - 1)) == 0); assert((granularity & (granularity - 1)) == 0);