commit 908bcd540f489f7adf2d804347905b0025d808d3
author Max Reitz <mreitz@redhat.com> Thu Aug 07 22:47:55 2014 +0200
committer Kevin Wolf <kwolf@redhat.com> Fri Aug 15 15:07:16 2014 +0200
tree 9f4b14955426dfa57bcfb940fb46e3ba5d4b3c47
parent a42f8a3d05c5598cee893c9cf5ffeee48bacb83e

block: Catch !bs->drv in bdrv_check()

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 <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

block.c

diff --git a/block.c b/block.c
index 6ef3465..6fa0201 100644
--- a/block.c
+++ b/block.c
@@ -2209,6 +2209,9 @@
  */
 int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix)
 {
+    if (bs->drv == NULL) {
+        return -ENOMEDIUM;
+    }
     if (bs->drv->bdrv_check == NULL) {
         return -ENOTSUP;
     }