diff options
| author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-08-09 13:05:56 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-08-10 10:25:12 +0200 |
| commit | 058f8f16db0c1c528b665a6283457f019c8b0926 (patch) | |
| tree | cf49eb0701d42ae865a1156354112f29e5800929 /tests | |
| parent | acbe59829e448aa63bdccc6ee484b7e1ac605e25 (diff) | |
| download | qemu-058f8f16db0c1c528b665a6283457f019c8b0926.zip qemu-058f8f16db0c1c528b665a6283457f019c8b0926.tar.gz qemu-058f8f16db0c1c528b665a6283457f019c8b0926.tar.bz2 | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemu-iotests/039.out | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out index 155a05e..cb510d6 100644 --- a/tests/qemu-iotests/039.out +++ b/tests/qemu-iotests/039.out @@ -26,6 +26,12 @@ incompatible_features 0x1 == Repairing the image file must succeed == ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0 Repairing cluster 5 refcount=0 reference=1 +The following inconsistencies were found and repaired: + + 0 leaked clusters + 1 corruptions + +Double checking the fixed image now... No errors were found on the image. incompatible_features 0x0 |