motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 01:21:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vmdk: Clean up "Invalid extent lines" error message

Browse source 
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>
This commit is contained in:
Markus Armbruster 2015-12-18 16:35:21 +01:00
parent e4937694b6
commit d28d737fb9
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
block/vmdk.c
View file

@ -780,7 +780,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
char access[11]; char access[11];
char type[11]; char type[11];
char fname[512]; char fname[512];
const char *p; const char *p, *np;
int64_t sectors = 0; int64_t sectors = 0;
int64_t flat_offset; int64_t flat_offset;
char *extent_path; char *extent_path;
@ -805,19 +805,16 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
continue; continue;
} else if (!strcmp(type, "FLAT")) { } else if (!strcmp(type, "FLAT")) {
if (matches != 5 || flat_offset < 0) { if (matches != 5 || flat_offset < 0) {
error_setg(errp, "Invalid extent lines: \n%s", p); goto invalid;
return -EINVAL;
} }
} else if (!strcmp(type, "VMFS")) { } else if (!strcmp(type, "VMFS")) {
if (matches == 4) { if (matches == 4) {
flat_offset = 0; flat_offset = 0;
} else { } else {
error_setg(errp, "Invalid extent lines:\n%s", p); goto invalid;
return -EINVAL;
} }
} else if (matches != 4) { } else if (matches != 4) {
error_setg(errp, "Invalid extent lines:\n%s", p); goto invalid;
return -EINVAL;
} }
if (sectors <= 0 || if (sectors <= 0 ||
@ -883,6 +880,15 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
extent->type = g_strdup(type); extent->type = g_strdup(type);
} }
return 0; 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, static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf,

4
tests/qemu-iotests/059.out
View file

@ -2038,9 +2038,7 @@ Format specific information:
format: FLAT format: FLAT
=== Testing malformed VMFS extent description line === === Testing malformed VMFS extent description line ===
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Invalid extent lines: qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Invalid extent line: RW 12582912 VMFS "dummy.IMGFMT" 1
RW 12582912 VMFS "dummy.IMGFMT" 1
=== Testing truncated sparse === === Testing truncated sparse ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 subformat=monolithicSparse Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 subformat=monolithicSparse