diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-03-16 19:54:33 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-03-17 15:47:56 +0100 |
| commit | a55448b3681a880b77eaefe8b2c42912000cb481 (patch) | |
| tree | 05401db82909ebe6c8b62c28504906631f8c8730 /block/vmdk.c | |
| parent | da31d594cf971795c1150ef1f5bdb01790b1b1b9 (diff) | |
| download | qemu-a55448b3681a880b77eaefe8b2c42912000cb481.zip qemu-a55448b3681a880b77eaefe8b2c42912000cb481.tar.gz qemu-a55448b3681a880b77eaefe8b2c42912000cb481.tar.bz2 | |
qapi: Drop QERR_UNKNOWN_BLOCK_FORMAT_FEATURE
Just specifying a custom string is simpler in basically all places that
used it, and in addition, specifying the BB or node name is something we
generally do not do in other error messages when opening a BDS, so we
should not do it here.
This changes the output for iotest 036 (to the better, in my opinion),
so the reference output needs to be changed accordingly.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/vmdk.c')
| -rw-r--r-- | block/vmdk.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index 23bd57e..2f8e6cf 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -661,11 +661,8 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, compressed = le16_to_cpu(header.compressAlgorithm) == VMDK4_COMPRESSION_DEFLATE; if (le32_to_cpu(header.version) > 3) { - char buf[64]; - snprintf(buf, sizeof(buf), "VMDK version %" PRId32, - le32_to_cpu(header.version)); - error_setg(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, - bdrv_get_device_or_node_name(bs), "vmdk", buf); + error_setg(errp, "Unsupported VMDK version %" PRIu32, + le32_to_cpu(header.version)); return -ENOTSUP; } else if (le32_to_cpu(header.version) == 3 && (flags & BDRV_O_RDWR) && !compressed) { |