cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
05bba0
From 2e9f9fc69b25cd73b46750497f494d3ea28d21e6 Mon Sep 17 00:00:00 2001
05bba0
From: Max Reitz <mreitz@redhat.com>
05bba0
Date: Sat, 13 Jun 2015 16:22:24 +0200
05bba0
Subject: [PATCH 30/42] iotests: Fix test outputs
05bba0
05bba0
Message-id: <1434212556-3927-31-git-send-email-mreitz@redhat.com>
05bba0
Patchwork-id: 66049
05bba0
O-Subject: [RHEL-7.2 qemu-kvm PATCH 30/42] iotests: Fix test outputs
05bba0
Bugzilla: 1129893
05bba0
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
05bba0
RH-Acked-by: Fam Zheng <famz@redhat.com>
05bba0
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
05bba0
05bba0
BZ: 1129893
05bba0
05bba0
039, 060 and 061 all create images with referenced clusters having a
05bba0
refcount of 0. Because previous commits changed handling of such errors,
05bba0
these tests now have a different output. Fix it.
05bba0
05bba0
Furthermore, 060 created a refblock with a refcount greater than one
05bba0
which now results in having to rebuild the refcount structure as well.
05bba0
05bba0
Signed-off-by: Max Reitz <mreitz@redhat.com>
05bba0
Reviewed-by: Eric Blake <eblake@redhat.com>
05bba0
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
05bba0
(cherry picked from commit d26e6ec052b8768ab45654dbf35d5213818a2cb8)
05bba0
05bba0
Signed-off-by: Max Reitz <mreitz@redhat.com>
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
---
05bba0
 tests/qemu-iotests/039.out | 10 ++++++++--
05bba0
 tests/qemu-iotests/060.out | 10 ++++++++--
05bba0
 tests/qemu-iotests/061.out | 18 ++++++++++++------
05bba0
 3 files changed, 28 insertions(+), 10 deletions(-)
05bba0
05bba0
diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out
05bba0
index 077fa64..d25bf0b 100644
05bba0
--- a/tests/qemu-iotests/039.out
05bba0
+++ b/tests/qemu-iotests/039.out
05bba0
@@ -24,7 +24,10 @@ read 512/512 bytes at offset 0
05bba0
 incompatible_features     0x1
05bba0
 
05bba0
 == Repairing the image file must succeed ==
05bba0
-Repairing cluster 5 refcount=0 reference=1
05bba0
+ERROR cluster 5 refcount=0 reference=1
05bba0
+Rebuilding refcount structure
05bba0
+Repairing cluster 1 refcount=1 reference=0
05bba0
+Repairing cluster 2 refcount=1 reference=0
05bba0
 The following inconsistencies were found and repaired:
05bba0
 
05bba0
     0 leaked clusters
05bba0
@@ -43,7 +46,10 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
05bba0
 wrote 512/512 bytes at offset 0
05bba0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
05bba0
 incompatible_features     0x1
05bba0
-Repairing cluster 5 refcount=0 reference=1
05bba0
+ERROR cluster 5 refcount=0 reference=1
05bba0
+Rebuilding refcount structure
05bba0
+Repairing cluster 1 refcount=1 reference=0
05bba0
+Repairing cluster 2 refcount=1 reference=0
05bba0
 wrote 512/512 bytes at offset 0
05bba0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
05bba0
 incompatible_features     0x0
05bba0
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
05bba0
index 4f0c6d0..88332e4 100644
05bba0
--- a/tests/qemu-iotests/060.out
05bba0
+++ b/tests/qemu-iotests/060.out
05bba0
@@ -27,11 +27,15 @@ incompatible_features     0x0
05bba0
 qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with refcount block); further corruption events will be suppressed
05bba0
 write failed: Input/output error
05bba0
 incompatible_features     0x2
05bba0
-Repairing refcount block 0 refcount=2
05bba0
+ERROR refcount block 0 refcount=2
05bba0
+ERROR cluster 2 refcount=1 reference=2
05bba0
+Rebuilding refcount structure
05bba0
+Repairing cluster 1 refcount=1 reference=0
05bba0
+Repairing cluster 2 refcount=2 reference=1
05bba0
 The following inconsistencies were found and repaired:
05bba0
 
05bba0
     0 leaked clusters
05bba0
-    1 corruptions
05bba0
+    2 corruptions
05bba0
 
05bba0
 Double checking the fixed image now...
05bba0
 No errors were found on the image.
05bba0
@@ -59,6 +63,8 @@ incompatible_features     0x0
05bba0
 qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with inactive L2 table); further corruption events will be suppressed
05bba0
 write failed: Input/output error
05bba0
 incompatible_features     0x2
05bba0
+ERROR cluster 4 refcount=1 reference=2
05bba0
+Leaked cluster 9 refcount=1 reference=0
05bba0
 Repairing cluster 4 refcount=1 reference=2
05bba0
 Repairing cluster 9 refcount=1 reference=0
05bba0
 Repairing OFLAG_COPIED data cluster: l2_entry=8000000000040000 refcount=2
05bba0
diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
05bba0
index 4027e00..c5127cf 100644
05bba0
--- a/tests/qemu-iotests/061.out
05bba0
+++ b/tests/qemu-iotests/061.out
05bba0
@@ -76,8 +76,11 @@ autoclear_features        0x0
05bba0
 refcount_order            4
05bba0
 header_length             104
05bba0
 
05bba0
-Repairing cluster 5 refcount=0 reference=1
05bba0
-Repairing cluster 6 refcount=0 reference=1
05bba0
+ERROR cluster 5 refcount=0 reference=1
05bba0
+ERROR cluster 6 refcount=0 reference=1
05bba0
+Rebuilding refcount structure
05bba0
+Repairing cluster 1 refcount=1 reference=0
05bba0
+Repairing cluster 2 refcount=1 reference=0
05bba0
 magic                     0x514649fb
05bba0
 version                   2
05bba0
 backing_file_offset       0x0
05bba0
@@ -87,7 +90,7 @@ size                      67108864
05bba0
 crypt_method              0
05bba0
 l1_size                   1
05bba0
 l1_table_offset           0x30000
05bba0
-refcount_table_offset     0x10000
05bba0
+refcount_table_offset     0x80000
05bba0
 refcount_table_clusters   1
05bba0
 nb_snapshots              0
05bba0
 snapshot_offset           0x0
05bba0
@@ -230,8 +233,11 @@ autoclear_features        0x0
05bba0
 refcount_order            4
05bba0
 header_length             104
05bba0
 
05bba0
-Repairing cluster 5 refcount=0 reference=1
05bba0
-Repairing cluster 6 refcount=0 reference=1
05bba0
+ERROR cluster 5 refcount=0 reference=1
05bba0
+ERROR cluster 6 refcount=0 reference=1
05bba0
+Rebuilding refcount structure
05bba0
+Repairing cluster 1 refcount=1 reference=0
05bba0
+Repairing cluster 2 refcount=1 reference=0
05bba0
 magic                     0x514649fb
05bba0
 version                   3
05bba0
 backing_file_offset       0x0
05bba0
@@ -241,7 +247,7 @@ size                      67108864
05bba0
 crypt_method              0
05bba0
 l1_size                   1
05bba0
 l1_table_offset           0x30000
05bba0
-refcount_table_offset     0x10000
05bba0
+refcount_table_offset     0x80000
05bba0
 refcount_table_clusters   1
05bba0
 nb_snapshots              0
05bba0
 snapshot_offset           0x0
05bba0
-- 
05bba0
1.8.3.1
05bba0