From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwJLv-0008H8-Aw for qemu-devel@nongnu.org; Wed, 03 Dec 2014 18:29:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwJLq-00088k-TW for qemu-devel@nongnu.org; Wed, 03 Dec 2014 18:28:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwJLq-00088c-Ln for qemu-devel@nongnu.org; Wed, 03 Dec 2014 18:28:54 -0500 From: Fam Zheng Date: Thu, 4 Dec 2014 07:28:34 +0800 Message-Id: <1417649314-13704-7-git-send-email-famz@redhat.com> In-Reply-To: <1417649314-13704-1-git-send-email-famz@redhat.com> References: <1417649314-13704-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v4 6/6] vmdk: Set errp on failures in vmdk_open_vmdk4 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Don Koch , Markus Armbruster , Stefan Hajnoczi , Max Reitz Reported-by: Markus Armbruster Signed-off-by: Fam Zheng Reviewed-by: Markus Armbruster Reviewed-by: Don Koch Reviewed-by: Max Reitz --- block/vmdk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/vmdk.c b/block/vmdk.c index da2d323..65af414 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -645,6 +645,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, bs->file->total_sectors * 512 - 1536, &footer, sizeof(footer)); if (ret < 0) { + error_setg_errno(errp, -ret, "Failed to read footer"); return ret; } @@ -656,6 +657,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, le32_to_cpu(footer.eos_marker.size) != 0 || le32_to_cpu(footer.eos_marker.type) != MARKER_END_OF_STREAM) { + error_setg(errp, "Invalid footer"); return -EINVAL; } @@ -686,6 +688,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gt) * le64_to_cpu(header.granularity); if (l1_entry_sectors == 0) { + error_setg(errp, "L1 entry size is invalid"); return -EINVAL; } l1_size = (le64_to_cpu(header.capacity) + l1_entry_sectors - 1) -- 1.9.3