From: Fam Zheng Date: Wed, 3 Dec 2014 23:28:34 +0000 (+0800) Subject: vmdk: Set errp on failures in vmdk_open_vmdk4 X-Git-Tag: v2.3.0-rc0~142^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d899d2e248b900c53dd9081bde9f110e05747433;p=thirdparty%2Fqemu.git vmdk: Set errp on failures in vmdk_open_vmdk4 Reported-by: Markus Armbruster Signed-off-by: Fam Zheng Reviewed-by: Markus Armbruster Reviewed-by: Don Koch Reviewed-by: Max Reitz Message-id: 1417649314-13704-7-git-send-email-famz@redhat.com Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf --- diff --git a/block/vmdk.c b/block/vmdk.c index da2d32391c3..65af414f3ce 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)