[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 6/6] vmdk: Set errp on failures in vmdk_open_
From: |
Don Koch |
Subject: |
Re: [Qemu-devel] [PATCH v3 6/6] vmdk: Set errp on failures in vmdk_open_vmdk4 |
Date: |
Wed, 3 Dec 2014 12:14:03 -0500 |
On Wed, 3 Dec 2014 18:28:41 +0800
Fam Zheng <address@hidden> wrote:
> Reported-by: Markus Armbruster <address@hidden>
> Signed-off-by: Fam Zheng <address@hidden>
> Reviewed-by: Markus Armbruster <address@hidden>
> ---
Reviewed-by: Don Koch <address@hidden>
> block/vmdk.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/block/vmdk.c b/block/vmdk.c
> index ed492bd..127479d 100644
> --- a/block/vmdk.c
> +++ b/block/vmdk.c
> @@ -642,6 +642,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;
> }
>
> @@ -653,6 +654,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;
> }
>
> @@ -683,6 +685,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
>
>
- Re: [Qemu-devel] [PATCH v3 4/6] vmdk: Check descriptor file length when reading it, (continued)