ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

parallels: create mark_used() helper which sets bit in used bitmap 

This functionality is used twice already and next patch will add more
code with it.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
This commit is contained in:
Denis V. Lunev 2023-09-18 20:00:46 +02:00
parent 8f5f532625
commit a398275e88
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
block/parallels.c
View File

@ -178,6 +178,21 @@ static void parallels_set_bat_entry(BDRVParallelsState *s,
bitmap_set(s->bat_dirty_bmap, bat_entry_off(index) / s->bat_dirty_block, 1); bitmap_set(s->bat_dirty_bmap, bat_entry_off(index) / s->bat_dirty_block, 1);
} }
static int mark_used(BlockDriverState *bs,
unsigned long *bitmap, uint32_t bitmap_size, int64_t off)
{
BDRVParallelsState *s = bs->opaque;
uint32_t cluster_index = host_cluster_index(s, off);
if (cluster_index >= bitmap_size) {
return -E2BIG;
}
if (test_bit(cluster_index, bitmap)) {
return -EBUSY;
}
bitmap_set(bitmap, cluster_index, 1);
return 0;
}
static int64_t coroutine_fn GRAPH_RDLOCK static int64_t coroutine_fn GRAPH_RDLOCK
allocate_clusters(BlockDriverState *bs, int64_t sector_num, allocate_clusters(BlockDriverState *bs, int64_t sector_num,
int nb_sectors, int *pnum) int nb_sectors, int *pnum)
@ -621,7 +636,7 @@ parallels_check_duplicate(BlockDriverState *bs, BdrvCheckResult *res,
BDRVParallelsState *s = bs->opaque; BDRVParallelsState *s = bs->opaque;
int64_t host_off, host_sector, guest_sector; int64_t host_off, host_sector, guest_sector;
unsigned long *bitmap; unsigned long *bitmap;
uint32_t i, bitmap_size, cluster_index, bat_entry; uint32_t i, bitmap_size, bat_entry;
int n, ret = 0; int n, ret = 0;
uint64_t *buf = NULL; uint64_t *buf = NULL;
bool fixed = false; bool fixed = false;
@ -655,10 +670,9 @@ parallels_check_duplicate(BlockDriverState *bs, BdrvCheckResult *res,
continue; continue;
} }
cluster_index = host_cluster_index(s, host_off); ret = mark_used(bs, bitmap, bitmap_size, host_off);
assert(cluster_index < bitmap_size); assert(ret != -E2BIG);
if (!test_bit(cluster_index, bitmap)) { if (ret == 0) {
bitmap_set(bitmap, cluster_index, 1);
continue; continue;
} }
@ -713,11 +727,13 @@ parallels_check_duplicate(BlockDriverState *bs, BdrvCheckResult *res,
* consistent for the new allocated clusters too. * consistent for the new allocated clusters too.
* *
* Note, clusters allocated outside the current image are not * Note, clusters allocated outside the current image are not
* considered, and the bitmap size doesn't change. * considered, and the bitmap size doesn't change. This specifically
* means that -E2BIG is OK.
*/ */
cluster_index = host_cluster_index(s, host_off); ret = mark_used(bs, bitmap, bitmap_size, host_off);
if (cluster_index < bitmap_size) { if (ret == -EBUSY) {
bitmap_set(bitmap, cluster_index, 1); res->check_errors++;
goto out_repair_bat;
} }
fixed = true; fixed = true;