[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 16/23] qemu-img: Drop redundant error message in
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v3 16/23] qemu-img: Drop redundant error message in compare |
Date: |
Thu, 13 Jul 2017 10:47:04 -0500 |
If a read error is encountered during 'qemu-img compare', we
were printing the "Error while reading offset ..." message twice.
Update the testsuite for the improved output.
Further simplify the code by hoisting the error code conversion
into the helper function, rather than repeating it at the callers.
Signed-off-by: Eric Blake <address@hidden>
---
v3: new patch
---
qemu-img.c | 19 +++++--------------
tests/qemu-iotests/074.out | 2 --
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index e54c47a..c0fd773 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1190,8 +1190,10 @@ static int64_t sectors_to_bytes(int64_t sectors)
/*
* Check if passed sectors are empty (not allocated or contain only 0 bytes)
*
- * Returns 0 in case sectors are filled with 0, 1 if sectors contain non-zero
- * data and negative value on error.
+ * Intended for use by 'qemu-img compare': Returns 0 in case sectors are
+ * filled with 0, 1 if sectors contain non-zero data (this is a comparison
+ * failure), and 4 on error (the exit status for read errors), after emitting
+ * an error message.
*
* @param blk: BlockBackend for the image
* @param sect_num: Number of first sector to check
@@ -1212,7 +1214,7 @@ static int check_empty_sectors(BlockBackend *blk, int64_t
sect_num,
if (ret < 0) {
error_report("Error while reading offset %" PRId64 " of %s: %s",
sectors_to_bytes(sect_num), filename, strerror(-ret));
- return ret;
+ return 4;
}
idx = find_nonzero(buffer, sect_count * BDRV_SECTOR_SIZE);
if (idx >= 0) {
@@ -1467,11 +1469,6 @@ static int img_compare(int argc, char **argv)
filename2, buf1, quiet);
}
if (ret) {
- if (ret < 0) {
- error_report("Error while reading offset %" PRId64 ": %s",
- sectors_to_bytes(sector_num), strerror(-ret));
- ret = 4;
- }
goto out;
}
}
@@ -1516,12 +1513,6 @@ static int img_compare(int argc, char **argv)
ret = check_empty_sectors(blk_over, sector_num, nb_sectors,
filename_over, buf1, quiet);
if (ret) {
- if (ret < 0) {
- error_report("Error while reading offset %" PRId64
- " of %s: %s",
sectors_to_bytes(sector_num),
- filename_over, strerror(-ret));
- ret = 4;
- }
goto out;
}
}
diff --git a/tests/qemu-iotests/074.out b/tests/qemu-iotests/074.out
index 8fba5ae..ede66c3 100644
--- a/tests/qemu-iotests/074.out
+++ b/tests/qemu-iotests/074.out
@@ -4,7 +4,6 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
wrote 512/512 bytes at offset 512
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
qemu-img: Error while reading offset 0 of
blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error
-qemu-img: Error while reading offset 0: Input/output error
4
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=0
@@ -12,7 +11,6 @@ Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=0
wrote 512/512 bytes at offset 512
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
qemu-img: Error while reading offset 0 of
blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error
-qemu-img: Error while reading offset 0 of
blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error
Warning: Image size mismatch!
4
Cleanup
--
2.9.4
- [Qemu-devel] [PATCH v3 06/23] qemu-img: Switch get_block_status() to byte-based, (continued)
- [Qemu-devel] [PATCH v3 06/23] qemu-img: Switch get_block_status() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 07/23] block: Convert bdrv_get_block_status() to bytes, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 09/23] block: Switch BdrvCoGetBlockStatusData to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 10/23] block: Switch bdrv_common_block_status_above() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 11/23] block: Switch bdrv_co_get_block_status_above() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 08/23] block: Switch bdrv_co_get_block_status() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 12/23] block: Convert bdrv_get_block_status_above() to bytes, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 13/23] qemu-img: Simplify logic in img_compare(), Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 14/23] qemu-img: Speed up compare on pre-allocated larger file, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 15/23] qemu-img: Add find_nonzero(), Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 16/23] qemu-img: Drop redundant error message in compare,
Eric Blake <=
- [Qemu-devel] [PATCH v3 17/23] qemu-img: Change check_empty_sectors() to byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 18/23] qemu-img: Change compare_sectors() to be byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 19/23] qemu-img: Change img_rebase() to be byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 20/23] qemu-img: Change img_compare() to be byte-based, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 22/23] block: Relax bdrv_aligned_preadv() assertion, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 21/23] block: Align block status requests, Eric Blake, 2017/07/13
- [Qemu-devel] [PATCH v3 23/23] qemu-io: Relax 'alloc' now that block-status doesn't assert, Eric Blake, 2017/07/13