From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrWrg-0004hD-AE for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:49:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrWrb-0003qd-Py for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:49:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48552) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrWrb-0003qW-Hd for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:49:23 -0500 From: Kevin Wolf Date: Fri, 13 Dec 2013 18:49:01 +0100 Message-Id: <1386956943-19474-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1386956943-19474-1-git-send-email-kwolf@redhat.com> References: <1386956943-19474-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 4/6] block: expect get_block_status errors in bdrv_make_zero List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Peter Lieven during testing around with 4k LUNs a bad target implementation triggert an -EIO in iscsi_get_block_status, but it got never caught resulting in an infinite loop. CC: qemu-stable@nongnu.org Signed-off-by: Peter Lieven Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block.c b/block.c index 13f001a..64e7d22 100644 --- a/block.c +++ b/block.c @@ -2421,6 +2421,11 @@ int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags) nb_sectors = INT_MAX; } ret = bdrv_get_block_status(bs, sector_num, nb_sectors, &n); + if (ret < 0) { + error_report("error getting block status at sector %" PRId64 ": %s", + sector_num, strerror(-ret)); + return ret; + } if (ret & BDRV_BLOCK_ZERO) { sector_num += n; continue; -- 1.8.1.4