diff options
| author | Alberto Garcia <berto@igalia.com> | 2015-04-08 12:29:19 +0300 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-04-28 15:36:09 +0200 |
| commit | 81e5f78a9f4f13548ec1edddaf780d339f18e2d2 (patch) | |
| tree | 4139d1fe692237ccfedf6bf1e446329289f320b8 /block/qed.c | |
| parent | 9b2aa84f87f5b95cb0295dcae38fbfbf115df2be (diff) | |
| download | qemu-81e5f78a9f4f13548ec1edddaf780d339f18e2d2.tar.gz qemu-81e5f78a9f4f13548ec1edddaf780d339f18e2d2.tar.bz2 qemu-81e5f78a9f4f13548ec1edddaf780d339f18e2d2.zip | |
block: use bdrv_get_device_or_node_name() in error messages
There are several error messages that identify a BlockDriverState by
its device name. However those errors can be produced in nodes that
don't have a device name associated.
In those cases we should use bdrv_get_device_or_node_name() to fall
back to the node name and produce a more meaningful message. The
messages are also updated to use the more generic term 'node' instead
of 'device'.
Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 9823a1f0514fdb0692e92868661c38a9e00a12d6.1428485266.git.berto@igalia.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/qed.c')
| -rw-r--r-- | block/qed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/qed.c b/block/qed.c index 9d908886da..5bbe069ce9 100644 --- a/block/qed.c +++ b/block/qed.c @@ -408,7 +408,7 @@ static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags, snprintf(buf, sizeof(buf), "%" PRIx64, s->header.features & ~QED_FEATURE_MASK); error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, - bdrv_get_device_name(bs), "QED", buf); + bdrv_get_device_or_node_name(bs), "QED", buf); return -ENOTSUP; } if (!qed_is_cluster_size_valid(s->header.cluster_size)) { |