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/qed.c | |
| parent | da31d594cf971795c1150ef1f5bdb01790b1b1b9 (diff) | |
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/qed.c')
| -rw-r--r-- | block/qed.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/block/qed.c b/block/qed.c index 5a58856ecd..225c6a5a80 100644 --- a/block/qed.c +++ b/block/qed.c @@ -400,11 +400,8 @@ static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags, } if (s->header.features & ~QED_FEATURE_MASK) { /* image uses unsupported feature bits */ - char buf[64]; - snprintf(buf, sizeof(buf), "%" PRIx64, - s->header.features & ~QED_FEATURE_MASK); - error_setg(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, - bdrv_get_device_or_node_name(bs), "QED", buf); + error_setg(errp, "Unsupported QED features: %" PRIx64, + s->header.features & ~QED_FEATURE_MASK); return -ENOTSUP; } if (!qed_is_cluster_size_valid(s->header.cluster_size)) { |