[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/15] block: Tweak error message related to qemu-img
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 13/15] block: Tweak error message related to qemu-img amend |
Date: |
Mon, 29 May 2017 17:06:52 +0200 |
From: Eric Blake <address@hidden>
When converting a 1.1 image down to 0.10, qemu-iotests 060 forces
a contrived failure where allocating a cluster used to replace a
zero cluster reads unaligned data. Since it is a zero cluster
rather than a data cluster being converted, changing the error
message to match our earlier change in 'qcow2: Make distinction
between zero cluster types obvious' is worthwhile.
Suggested-by: Max Reitz <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-id: address@hidden
[mreitz: Commit message fixes]
Signed-off-by: Max Reitz <address@hidden>
---
block/qcow2-cluster.c | 3 ++-
tests/qemu-iotests/060.out | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 347d94b..d779ea1 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1797,7 +1797,8 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
}
if (offset_into_cluster(s, offset)) {
- qcow2_signal_corruption(bs, true, -1, -1, "Data cluster offset
"
+ qcow2_signal_corruption(bs, true, -1, -1,
+ "Cluster allocation offset "
"%#" PRIx64 " unaligned (L2 offset: %#"
PRIx64 ", L2 index: %#x)", offset,
l2_offset, j);
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
index 9e8f5b9..3bc1461 100644
--- a/tests/qemu-iotests/060.out
+++ b/tests/qemu-iotests/060.out
@@ -143,7 +143,7 @@ read failed: Input/output error
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-qcow2: Marking image as corrupt: Data cluster offset 0x52a00 unaligned (L2
offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+qcow2: Marking image as corrupt: Cluster allocation offset 0x52a00 unaligned
(L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
qemu-img: Error while amending options: Input/output error
=== Testing unaligned reftable entry ===
--
1.8.3.1
- [Qemu-devel] [PULL 03/15] iotests: 147: Don't test inet6 if not available, (continued)
- [Qemu-devel] [PULL 03/15] iotests: 147: Don't test inet6 if not available, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 01/15] stream: fix crash in stream_start() when block_job_create() fails, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 05/15] mirror: Drop permissions on s->target on completion, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 04/15] nvme: Add support for Controller Memory Buffers, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 08/15] qemu-img: add support for --object with 'dd' command, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 06/15] qcow2: remove extra local_error variable, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 09/15] qemu-img: fix --image-opts usage with dd command, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 07/15] qemu-img: Fix documentation of convert, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 10/15] qemu-img: introduce --target-image-opts for 'convert' command, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 11/15] qemu-img: copy *key-secret opts when opening newly created files, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 13/15] block: Tweak error message related to qemu-img amend,
Kevin Wolf <=
- [Qemu-devel] [PULL 12/15] qemu-img: Fix leakage of options on error, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 14/15] block: Fix backing paths for filenames with colons, Kevin Wolf, 2017/05/29
- [Qemu-devel] [PULL 15/15] block/file-*: *_parse_filename() and colons, Kevin Wolf, 2017/05/29
- Re: [Qemu-devel] [Qemu-block] [PULL 00/15] Block layer patches, Stefan Hajnoczi, 2017/05/30