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 /blockdev.c | |
| parent | 9b2aa84f87f5b95cb0295dcae38fbfbf115df2be (diff) | |
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 'blockdev.c')
| -rw-r--r-- | blockdev.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/blockdev.c b/blockdev.c index 9132d69e09..e67c701879 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1248,13 +1248,14 @@ static void internal_snapshot_prepare(BlkTransactionState *common, } if (bdrv_is_read_only(bs)) { - error_set(errp, QERR_DEVICE_IS_READ_ONLY, device); + error_setg(errp, "Device '%s' is read only", device); return; } if (!bdrv_can_snapshot(bs)) { - error_set(errp, QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED, - bs->drv->format_name, device, "internal snapshot"); + error_setg(errp, "Block format '%s' used by device '%s' " + "does not support internal snapshots", + bs->drv->format_name, device); return; } @@ -2055,7 +2056,7 @@ void qmp_block_resize(bool has_device, const char *device, error_set(errp, QERR_UNSUPPORTED); break; case -EACCES: - error_set(errp, QERR_DEVICE_IS_READ_ONLY, device); + error_setg(errp, "Device '%s' is read only", device); break; case -EBUSY: error_set(errp, QERR_DEVICE_IN_USE, device); |