ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iotests: Fix test outputs 

039, 060 and 061 all create images with referenced clusters having a
refcount of 0. Because previous commits changed handling of such errors,
these tests now have a different output. Fix it.

Furthermore, 060 created a refblock with a refcount greater than one
which now results in having to rebuild the refcount structure as well.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2014-10-22 14:09:42 +02:00 committed by Kevin Wolf
parent 791230d8bb
commit d26e6ec052
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/qemu-iotests/039.out
View File

@ -25,7 +25,10 @@ read 512/512 bytes at offset 0
incompatible_features 0x1 incompatible_features 0x1
== Repairing the image file must succeed == == Repairing the image file must succeed ==
Repairing cluster 5 refcount=0 reference=1 ERROR cluster 5 refcount=0 reference=1
Rebuilding refcount structure
Repairing cluster 1 refcount=1 reference=0
Repairing cluster 2 refcount=1 reference=0
The following inconsistencies were found and repaired: The following inconsistencies were found and repaired:
0 leaked clusters 0 leaked clusters
@ -45,7 +48,10 @@ wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
./039: Aborted ( ulimit -c 0; exec "$@" ) ./039: Aborted ( ulimit -c 0; exec "$@" )
incompatible_features 0x1 incompatible_features 0x1
Repairing cluster 5 refcount=0 reference=1 ERROR cluster 5 refcount=0 reference=1
Rebuilding refcount structure
Repairing cluster 1 refcount=1 reference=0
Repairing cluster 2 refcount=1 reference=0
wrote 512/512 bytes at offset 0 wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
incompatible_features 0x0 incompatible_features 0x0

10
tests/qemu-iotests/060.out
View File

@ -36,11 +36,15 @@ incompatible_features 0x0
qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with refcount block); further corruption events will be suppressed qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with refcount block); further corruption events will be suppressed
write failed: Input/output error write failed: Input/output error
incompatible_features 0x2 incompatible_features 0x2
Repairing refcount block 0 refcount=2 ERROR refcount block 0 refcount=2
ERROR cluster 2 refcount=1 reference=2
Rebuilding refcount structure
Repairing cluster 1 refcount=1 reference=0
Repairing cluster 2 refcount=2 reference=1
The following inconsistencies were found and repaired: The following inconsistencies were found and repaired:
0 leaked clusters 0 leaked clusters
1 corruptions 2 corruptions
Double checking the fixed image now... Double checking the fixed image now...
No errors were found on the image. No errors were found on the image.
@ -68,6 +72,8 @@ incompatible_features 0x0
qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with inactive L2 table); further corruption events will be suppressed qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with inactive L2 table); further corruption events will be suppressed
write failed: Input/output error write failed: Input/output error
incompatible_features 0x2 incompatible_features 0x2
ERROR cluster 4 refcount=1 reference=2
Leaked cluster 9 refcount=1 reference=0
Repairing cluster 4 refcount=1 reference=2 Repairing cluster 4 refcount=1 reference=2
Repairing cluster 9 refcount=1 reference=0 Repairing cluster 9 refcount=1 reference=0
Repairing OFLAG_COPIED data cluster: l2_entry=8000000000040000 refcount=2 Repairing OFLAG_COPIED data cluster: l2_entry=8000000000040000 refcount=2

18
tests/qemu-iotests/061.out
View File

@ -76,8 +76,11 @@ autoclear_features 0x0
refcount_order 4 refcount_order 4
header_length 104 header_length 104
Repairing cluster 5 refcount=0 reference=1 ERROR cluster 5 refcount=0 reference=1
Repairing cluster 6 refcount=0 reference=1 ERROR cluster 6 refcount=0 reference=1
Rebuilding refcount structure
Repairing cluster 1 refcount=1 reference=0
Repairing cluster 2 refcount=1 reference=0
magic 0x514649fb magic 0x514649fb
version 2 version 2
backing_file_offset 0x0 backing_file_offset 0x0
@ -87,7 +90,7 @@ size 67108864
crypt_method 0 crypt_method 0
l1_size 1 l1_size 1
l1_table_offset 0x30000 l1_table_offset 0x30000
refcount_table_offset 0x10000 refcount_table_offset 0x80000
refcount_table_clusters 1 refcount_table_clusters 1
nb_snapshots 0 nb_snapshots 0
snapshot_offset 0x0 snapshot_offset 0x0
@ -230,8 +233,11 @@ autoclear_features 0x0
refcount_order 4 refcount_order 4
header_length 104 header_length 104
Repairing cluster 5 refcount=0 reference=1 ERROR cluster 5 refcount=0 reference=1
Repairing cluster 6 refcount=0 reference=1 ERROR cluster 6 refcount=0 reference=1
Rebuilding refcount structure
Repairing cluster 1 refcount=1 reference=0
Repairing cluster 2 refcount=1 reference=0
magic 0x514649fb magic 0x514649fb
version 3 version 3
backing_file_offset 0x0 backing_file_offset 0x0
@ -241,7 +247,7 @@ size 67108864
crypt_method 0 crypt_method 0
l1_size 1 l1_size 1
l1_table_offset 0x30000 l1_table_offset 0x30000
refcount_table_offset 0x10000 refcount_table_offset 0x80000
refcount_table_clusters 1 refcount_table_clusters 1
nb_snapshots 0 nb_snapshots 0
snapshot_offset 0x0 snapshot_offset 0x0