diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-17 14:44:06 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-02-21 21:02:24 +0100 |
| commit | 76abe4071d111a9ca6dcc9b9689a831c39ffa718 (patch) | |
| tree | fc844ff36395e5b133a7d1b7f60fe7a56bb85d61 /block/vmdk.c | |
| parent | 89ac8480a8c7f73dd943dcb1313d6bd984f9a870 (diff) | |
| download | qemu-76abe4071d111a9ca6dcc9b9689a831c39ffa718.tar.gz qemu-76abe4071d111a9ca6dcc9b9689a831c39ffa718.tar.bz2 qemu-76abe4071d111a9ca6dcc9b9689a831c39ffa718.zip | |
block: do not abuse EMEDIUMTYPE
Returning "Wrong medium type" for an image that does not have a valid
header is a bit weird. Improve the error by mentioning what format
was trying to open it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/vmdk.c')
| -rw-r--r-- | block/vmdk.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index 9c3711cbbf..83839f9b7a 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -748,7 +748,8 @@ static int vmdk_open_sparse(BlockDriverState *bs, return vmdk_open_vmdk4(bs, file, flags, errp); break; default: - return -EMEDIUMTYPE; + error_setg(errp, "Image not in VMDK format"); + return -EINVAL; break; } } @@ -862,7 +863,8 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf, BDRVVmdkState *s = bs->opaque; if (vmdk_parse_description(buf, "createType", ct, sizeof(ct))) { - ret = -EMEDIUMTYPE; + error_setg(errp, "invalid VMDK image descriptor"); + ret = -EINVAL; goto exit; } if (strcmp(ct, "monolithicFlat") && |