]> git.proxmox.com Git - qemu.git/commit
block: add BLOCK_O_CHECK for qemu-img check
authorStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Thu, 9 Aug 2012 12:05:56 +0000 (13:05 +0100)
committerKevin Wolf <kwolf@redhat.com>
Fri, 10 Aug 2012 08:25:12 +0000 (10:25 +0200)
commit058f8f16db0c1c528b665a6283457f019c8b0926
treecf49eb0701d42ae865a1156354112f29e5800929
parentacbe59829e448aa63bdccc6ee484b7e1ac605e25
block: add BLOCK_O_CHECK for qemu-img check

Image formats with a dirty bit, like qed and qcow2, repair dirty image
files upon open with BDRV_O_RDWR.  Performing automatic repair when
qemu-img check runs is not ideal because the bdrv_open() call repairs
the image before the actual bdrv_check() call from qemu-img.c.

Fix this "double repair" since it leads to confusing output from
qemu-img check.  Tell the block driver that this image is being opened
just for bdrv_check().  This skips automatic repair and qemu-img.c can
invoke it manually with bdrv_check().

Update the golden output for qemu-iotests 039 to reflect the new
qemu-img check output.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block.h
block/qcow2.c
block/qed.c
qemu-img.c
tests/qemu-iotests/039.out