diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-12-18 16:35:21 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-01-13 15:16:18 +0100 |
| commit | d28d737fb9b1f6c2a58821f8a4640adecf99249b (patch) | |
| tree | c26d34c22fd51a49b7b26758a59549a033f2e050 | |
| parent | e4937694b66d1468aec3cd95e90888f291c3f599 (diff) | |
| download | qemu-d28d737fb9b1f6c2a58821f8a4640adecf99249b.tar.gz qemu-d28d737fb9b1f6c2a58821f8a4640adecf99249b.tar.bz2 qemu-d28d737fb9b1f6c2a58821f8a4640adecf99249b.zip | |
vmdk: Clean up "Invalid extent lines" error message
vmdk_parse_extents() reports parse errors like this:
error_setg(errp, "Invalid extent lines:\n%s", p);
where p points to the beginning of the malformed line in the image
descriptor. This results in a multi-line error message
Invalid extent lines:
<first line that doesn't parse>
<remaining text that may or may not parse, if any>
Error messages should not have newlines embedded. Since the remaining
text is not helpful, we can simply report:
Invalid extent line: <first line that doesn't parse>
Cc: Fam Zheng <famz@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1450452927-8346-19-git-send-email-armbru@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
| -rw-r--r-- | block/vmdk.c | 20 | ||||
| -rw-r--r-- | tests/qemu-iotests/059.out | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index 08fa3f3b12..2b5cb00ef1 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -780,7 +780,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, char access[11]; char type[11]; char fname[512]; - const char *p; + const char *p, *np; int64_t sectors = 0; int64_t flat_offset; char *extent_path; @@ -805,19 +805,16 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, continue; } else if (!strcmp(type, "FLAT")) { if (matches != 5 || flat_offset < 0) { - error_setg(errp, "Invalid extent lines: \n%s", p); - return -EINVAL; + goto invalid; } } else if (!strcmp(type, "VMFS")) { if (matches == 4) { flat_offset = 0; } else { - error_setg(errp, "Invalid extent lines:\n%s", p); - return -EINVAL; + goto invalid; } } else if (matches != 4) { - error_setg(errp, "Invalid extent lines:\n%s", p); - return -EINVAL; + goto invalid; } if (sectors <= 0 || @@ -883,6 +880,15 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, extent->type = g_strdup(type); } return 0; + +invalid: + np = next_line(p); + assert(np != p); + if (np[-1] == '\n') { + np--; + } + error_setg(errp, "Invalid extent line: %.*s", (int)(np - p), p); + return -EINVAL; } static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf, diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index d28df5bb62..9d506cb80c 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -2038,9 +2038,7 @@ Format specific information: format: FLAT === Testing malformed VMFS extent description line === -qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Invalid extent lines: -RW 12582912 VMFS "dummy.IMGFMT" 1 - +qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Invalid extent line: RW 12582912 VMFS "dummy.IMGFMT" 1 === Testing truncated sparse === Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 subformat=monolithicSparse |