summaryrefslogtreecommitdiffstats
path: root/block.c
diff options
context:
space:
mode:
authorMax Reitz2016-03-16 19:54:34 +0100
committerKevin Wolf2016-03-17 15:47:56 +0100
commitd0e46a55776a59c8fdbb75620e7c5fcf0d6aa029 (patch)
tree56d1064faabd763b05d6acd87c3e9b7a657ced38 /block.c
parentqapi: Drop QERR_UNKNOWN_BLOCK_FORMAT_FEATURE (diff)
downloadqemu-d0e46a55776a59c8fdbb75620e7c5fcf0d6aa029.tar.gz
qemu-d0e46a55776a59c8fdbb75620e7c5fcf0d6aa029.tar.xz
qemu-d0e46a55776a59c8fdbb75620e7c5fcf0d6aa029.zip
block: Drop BB name from bad option error
The information which BB is concerned does not seem useful enough to justify its existence in most other place (which may be related to qemu printing the -drive parameter in question anyway, and for blockdev-add the attribution is naturally unambiguous). Furthermore, as of a future patch, bdrv_get_device_name(bs) will always return the empty string before bdrv_open_inherit() returns. Therefore, just dropping that information seems to be the best course of action. Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r--block.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/block.c b/block.c
index 59a18a3a66..582a9e8ce3 100644
--- a/block.c
+++ b/block.c
@@ -1671,9 +1671,9 @@ static int bdrv_open_inherit(BlockDriverState **pbs, const char *filename,
error_setg(errp, "Block protocol '%s' doesn't support the option "
"'%s'", drv->format_name, entry->key);
} else {
- error_setg(errp, "Block format '%s' used by device '%s' doesn't "
- "support the option '%s'", drv->format_name,
- bdrv_get_device_name(bs), entry->key);
+ error_setg(errp,
+ "Block format '%s' does not support the option '%s'",
+ drv->format_name, entry->key);
}
ret = -EINVAL;