haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

raw-posix: return get_block_status data and flags

Browse source 
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-09-04 19:00:35 +02:00 committed by Stefan Hajnoczi
parent facd6e2b5c
commit 63390a8d14
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
block/raw-posix.c
View file

@ -1089,7 +1089,7 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
int nb_sectors, int *pnum) int nb_sectors, int *pnum)
{ {
off_t start, data, hole; off_t start, data, hole;
int ret; int64_t ret;
ret = fd_open(bs); ret = fd_open(bs);
if (ret < 0) { if (ret < 0) {
@ -1097,6 +1097,7 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
} }
start = sector_num * BDRV_SECTOR_SIZE; start = sector_num * BDRV_SECTOR_SIZE;
ret = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | start;
#ifdef CONFIG_FIEMAP #ifdef CONFIG_FIEMAP
@ -1114,7 +1115,7 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
if (ioctl(s->fd, FS_IOC_FIEMAP, &f) == -1) { if (ioctl(s->fd, FS_IOC_FIEMAP, &f) == -1) {
/* Assume everything is allocated. */ /* Assume everything is allocated. */
*pnum = nb_sectors; *pnum = nb_sectors;
return 1; return ret;
} }
if (f.fm.fm_mapped_extents == 0) { if (f.fm.fm_mapped_extents == 0) {
@ -1141,7 +1142,7 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
/* Most likely EINVAL. Assume everything is allocated. */ /* Most likely EINVAL. Assume everything is allocated. */
*pnum = nb_sectors; *pnum = nb_sectors;
return 1; return ret;
} }
if (hole > start) { if (hole > start) {
@ -1154,19 +1155,21 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
} }
} }
#else #else
*pnum = nb_sectors; data = 0;
return 1; hole = start + nb_sectors * BDRV_SECTOR_SIZE;
#endif #endif
if (data <= start) { if (data <= start) {
/* On a data extent, compute sectors to the end of the extent. */ /* On a data extent, compute sectors to the end of the extent. */
*pnum = MIN(nb_sectors, (hole - start) / BDRV_SECTOR_SIZE); *pnum = MIN(nb_sectors, (hole - start) / BDRV_SECTOR_SIZE);
return 1;
} else { } else {
/* On a hole, compute sectors to the beginning of the next extent. */ /* On a hole, compute sectors to the beginning of the next extent. */
*pnum = MIN(nb_sectors, (data - start) / BDRV_SECTOR_SIZE); *pnum = MIN(nb_sectors, (data - start) / BDRV_SECTOR_SIZE);
return 0; ret &= ~BDRV_BLOCK_DATA;
ret |= BDRV_BLOCK_ZERO;
} }
return ret;
} }
static coroutine_fn BlockDriverAIOCB *raw_aio_discard(BlockDriverState *bs, static coroutine_fn BlockDriverAIOCB *raw_aio_discard(BlockDriverState *bs,