mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

raw-posix: Fix build without is_allocated support

Browse Source 
Move the declaration of s into the #ifdef sections that actually make
use of it.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Kevin Wolf 2012-06-19 22:02:51 +00:00 committed by Alexander Graf
parent c73e3771ea
commit 94282e7146
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/raw-posix.c
View File

@ -606,7 +606,6 @@ static int coroutine_fn raw_co_is_allocated(BlockDriverState *bs,
int64_t sector_num, int64_t sector_num,
int nb_sectors, int *pnum) int nb_sectors, int *pnum)
{ {
BDRVRawState *s = bs->opaque;
off_t start, data, hole; off_t start, data, hole;
int ret; int ret;
@ -616,11 +615,15 @@ static int coroutine_fn raw_co_is_allocated(BlockDriverState *bs,
} }
start = sector_num * BDRV_SECTOR_SIZE; start = sector_num * BDRV_SECTOR_SIZE;
#ifdef CONFIG_FIEMAP #ifdef CONFIG_FIEMAP
BDRVRawState *s = bs->opaque;
struct { struct {
struct fiemap fm; struct fiemap fm;
struct fiemap_extent fe; struct fiemap_extent fe;
} f; } f;
f.fm.fm_start = start; f.fm.fm_start = start;
f.fm.fm_length = (int64_t)nb_sectors * BDRV_SECTOR_SIZE; f.fm.fm_length = (int64_t)nb_sectors * BDRV_SECTOR_SIZE;
f.fm.fm_flags = 0; f.fm.fm_flags = 0;
@ -643,7 +646,11 @@ static int coroutine_fn raw_co_is_allocated(BlockDriverState *bs,
data = f.fe.fe_logical; data = f.fe.fe_logical;
hole = f.fe.fe_logical + f.fe.fe_length; hole = f.fe.fe_logical + f.fe.fe_length;
} }
#elif defined SEEK_HOLE && defined SEEK_DATA #elif defined SEEK_HOLE && defined SEEK_DATA
BDRVRawState *s = bs->opaque;
hole = lseek(s->fd, start, SEEK_HOLE); hole = lseek(s->fd, start, SEEK_HOLE);
if (hole == -1) { if (hole == -1) {
/* -ENXIO indicates that sector_num was past the end of the file. /* -ENXIO indicates that sector_num was past the end of the file.