From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFUbd-0005fS-U6 for qemu-devel@nongnu.org; Thu, 07 Aug 2014 16:48:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XFUbX-0006Me-Nx for qemu-devel@nongnu.org; Thu, 07 Aug 2014 16:48:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54856) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFUbX-0006Ma-Ge for qemu-devel@nongnu.org; Thu, 07 Aug 2014 16:48:07 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s77Km6kD019434 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 7 Aug 2014 16:48:07 -0400 From: Max Reitz Date: Thu, 7 Aug 2014 22:47:55 +0200 Message-Id: <1407444475-19516-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1407444475-19516-1-git-send-email-mreitz@redhat.com> References: <1407444475-19516-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] block: Catch !bs->drv in bdrv_check() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz qemu-img check calls bdrv_check() twice if the first run repaired some inconsistencies. If the first run however again triggered corruption prevention (on qcow2) due to very bad inconsistencies, bs->drv may be NULL afterwards. Thus, bdrv_check() should check whether bs->drv is set. Signed-off-by: Max Reitz --- block.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block.c b/block.c index 8cf519b..2b470d8 100644 --- a/block.c +++ b/block.c @@ -2203,6 +2203,9 @@ bool bdrv_dev_is_medium_locked(BlockDriverState *bs) */ int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix) { + if (bs->drv == NULL) { + return -ENOMEDIUM; + } if (bs->drv->bdrv_check == NULL) { return -ENOTSUP; } -- 2.0.3