Re: [Qemu-devel] [PATCH 2/8] vmdk: fix return values of vmdk_parent_open

[Kevin Wolf <kwolf@redhat.com>]

Am 19.10.2011 16:59, schrieb Paolo Bonzini:
> While vmdk_open_desc_file (touched by the patch) correctly changed -1
> to -EINVAL, vmdk_open did not.  Fix it directly in vmdk_parent_open.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  block/vmdk.c |   11 ++++++-----
>  1 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/block/vmdk.c b/block/vmdk.c
> index 5d16ec4..21566eb 100644
> --- a/block/vmdk.c
> +++ b/block/vmdk.c
> @@ -286,7 +286,7 @@ static int vmdk_parent_open(BlockDriverState *bs)
>  
>      desc[DESC_SIZE] = '\0';
>      if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) {
> -        return -1;
> +        return -EINVAL;
>      }

ret = bdrv_pread(...);
if (ret < 0) {
    return ret;
}

Kevin