From a55448b3681a880b77eaefe8b2c42912000cb481 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Wed, 16 Mar 2016 19:54:33 +0100 Subject: 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 Signed-off-by: Kevin Wolf --- block/qcow.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'block/qcow.c') diff --git a/block/qcow.c b/block/qcow.c index 2fd5ee65d4..c09cb7989a 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -121,11 +121,7 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } if (header.version != QCOW_VERSION) { - char version[64]; - snprintf(version, sizeof(version), "QCOW version %" PRIu32, - header.version); - error_setg(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, - bdrv_get_device_or_node_name(bs), "qcow", version); + error_setg(errp, "Unsupported qcow version %" PRIu32, header.version); ret = -ENOTSUP; goto fail; } -- cgit v1.2.1