From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9rm0-0002fE-0f for qemu-devel@nongnu.org; Fri, 18 Dec 2015 04:56:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9rlz-0004ha-0f for qemu-devel@nongnu.org; Fri, 18 Dec 2015 04:56:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47341) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9rly-0004hW-PE for qemu-devel@nongnu.org; Fri, 18 Dec 2015 04:56:26 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 5904B42E5C4 for ; Fri, 18 Dec 2015 09:56:26 +0000 (UTC) From: Markus Armbruster References: <1450371004-26866-1-git-send-email-armbru@redhat.com> <1450371004-26866-19-git-send-email-armbru@redhat.com> <20151218005200.GC25529@ad.usersys.redhat.com> Date: Fri, 18 Dec 2015 10:56:23 +0100 In-Reply-To: <20151218005200.GC25529@ad.usersys.redhat.com> (Fam Zheng's message of "Fri, 18 Dec 2015 08:52:00 +0800") Message-ID: <87fuz0hygo.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v2 18/23] vmdk: Clean up "Invalid extent lines" error message List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: qemu-devel@nongnu.org Fam Zheng writes: > On Thu, 12/17 17:49, Markus Armbruster wrote: >> 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: >> >> >> >> Error messages should not have newlines embedded. Since the remaining >> text is not helpful, we can simply report: >> >> Invalid extent line: >> >> Cc: Fam Zheng >> Signed-off-by: Markus Armbruster >> --- >> block/vmdk.c | 19 ++++++++++++------- >> tests/qemu-iotests/059.out | 4 +--- >> 2 files changed, 13 insertions(+), 10 deletions(-) >> >> diff --git a/block/vmdk.c b/block/vmdk.c >> index 08fa3f3..04b47e3 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,14 @@ 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--; > > Braces are required. Fixing... >> + 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 d28df5b..9d506cb 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 >> -- >> 2.4.3 >>