From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XW8lr-00055Z-B4 for qemu-devel@nongnu.org; Mon, 22 Sep 2014 14:55:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XW8lJ-0007CU-JJ for qemu-devel@nongnu.org; Mon, 22 Sep 2014 14:55:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7801) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XW8lJ-0007A9-AH for qemu-devel@nongnu.org; Mon, 22 Sep 2014 14:55:01 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8MFNpmk004067 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 22 Sep 2014 11:23:51 -0400 From: Max Reitz Date: Mon, 22 Sep 2014 17:23:44 +0200 Message-Id: <1411399425-23430-2-git-send-email-mreitz@redhat.com> In-Reply-To: <1411399425-23430-1-git-send-email-mreitz@redhat.com> References: <1411399425-23430-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] raw-posix: Fix raw_co_get_block_status() after EOF List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi , Max Reitz As its comment states, raw_co_get_block_status() should unconditionally return 0 and set *pnum to 0 for after EOF. An assertion after lseek(..., SEEK_HOLE) tried to catch this case by asserting that errno != -ENXIO (which would indicate a position after the EOF); but it should be errno != ENXIO instead. Fix this, too. Reported-by: Kevin Wolf Signed-off-by: Max Reitz --- block/raw-posix.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index a253697..de4e3f3 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1509,9 +1509,9 @@ static int64_t try_seek_hole(BlockDriverState *bs, off_t start, off_t *data, *hole = lseek(s->fd, start, SEEK_HOLE); 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. * There is a virtual hole there. */ - assert(errno != -ENXIO); + assert(errno != ENXIO); return -errno; } @@ -1560,6 +1560,10 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs, } start = sector_num * BDRV_SECTOR_SIZE; + if (start >= bdrv_getlength(bs)) { + *pnum = 0; + return 0; + } ret = try_fiemap(bs, start, &data, &hole, nb_sectors, pnum); if (ret < 0) { -- 2.1.0