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

qemu-img: Switch get_block_status() to byte-based 

We are gradually converting to byte-based interfaces, as they are
easier to reason about than sector-based.  Continue by converting
an internal function (no semantic change), and simplifying its
caller accordingly.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Eric Blake 2017-10-11 22:47:02 -05:00 committed by Kevin Wolf
parent 7286d6106f
commit 5e344dd8c2
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qemu-img.c
View File

@ -2671,14 +2671,16 @@ static void dump_map_entry(OutputFormat output_format, MapEntry *e,
} }
} }
static int get_block_status(BlockDriverState *bs, int64_t sector_num, static int get_block_status(BlockDriverState *bs, int64_t offset,
int nb_sectors, MapEntry *e) int64_t bytes, MapEntry *e)
{ {
int64_t ret; int64_t ret;
int depth; int depth;
BlockDriverState *file; BlockDriverState *file;
bool has_offset; bool has_offset;
int nb_sectors = bytes >> BDRV_SECTOR_BITS;
assert(bytes < INT_MAX);
/* As an optimization, we could cache the current range of unallocated /* As an optimization, we could cache the current range of unallocated
* clusters in each file of the chain, and avoid querying the same * clusters in each file of the chain, and avoid querying the same
* range repeatedly. * range repeatedly.
@ -2686,8 +2688,8 @@ static int get_block_status(BlockDriverState *bs, int64_t sector_num,
depth = 0; depth = 0;
for (;;) { for (;;) {
ret = bdrv_get_block_status(bs, sector_num, nb_sectors, &nb_sectors, ret = bdrv_get_block_status(bs, offset >> BDRV_SECTOR_BITS, nb_sectors,
&file); &nb_sectors, &file);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -2707,7 +2709,7 @@ static int get_block_status(BlockDriverState *bs, int64_t sector_num,
has_offset = !!(ret & BDRV_BLOCK_OFFSET_VALID); has_offset = !!(ret & BDRV_BLOCK_OFFSET_VALID);
*e = (MapEntry) { *e = (MapEntry) {
.start = sector_num * BDRV_SECTOR_SIZE, .start = offset,
.length = nb_sectors * BDRV_SECTOR_SIZE, .length = nb_sectors * BDRV_SECTOR_SIZE,
.data = !!(ret & BDRV_BLOCK_DATA), .data = !!(ret & BDRV_BLOCK_DATA),
.zero = !!(ret & BDRV_BLOCK_ZERO), .zero = !!(ret & BDRV_BLOCK_ZERO),
@ -2837,16 +2839,12 @@ static int img_map(int argc, char **argv)
length = blk_getlength(blk); length = blk_getlength(blk);
while (curr.start + curr.length < length) { while (curr.start + curr.length < length) {
int64_t nsectors_left; int64_t offset = curr.start + curr.length;
int64_t sector_num; int64_t n;
int n;
sector_num = (curr.start + curr.length) >> BDRV_SECTOR_BITS;
/* Probe up to 1 GiB at a time. */ /* Probe up to 1 GiB at a time. */
nsectors_left = DIV_ROUND_UP(length, BDRV_SECTOR_SIZE) - sector_num; n = QEMU_ALIGN_DOWN(MIN(1 << 30, length - offset), BDRV_SECTOR_SIZE);
n = MIN(1 << (30 - BDRV_SECTOR_BITS), nsectors_left); ret = get_block_status(bs, offset, n, &next);
ret = get_block_status(bs, sector_num, n, &next);
if (ret < 0) { if (ret < 0) {
error_report("Could not read file metadata: %s", strerror(-ret)); error_report("Could not read file metadata: %s", strerror(-ret));