From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 08/29] block: Drop BB name from bad option error
Date: Thu, 17 Mar 2016 16:56:21 +0100 [thread overview]
Message-ID: <1458230202-29136-9-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1458230202-29136-1-git-send-email-kwolf@redhat.com>
From: Max Reitz <mreitz@redhat.com>
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>
---
block.c | 6 +++---
tests/qemu-iotests/051.out | 8 ++++----
tests/qemu-iotests/051.pc.out | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/block.c b/block.c
index 59a18a3..582a9e8 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;
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 0f8a8d3..c1291ff 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -5,16 +5,16 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/
=== Unknown option ===
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=,if=none,id=drive0
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=,if=none,id=drive0: Block format 'qcow2' used by device 'drive0' doesn't support the option 'unknown_opt'
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=,if=none,id=drive0: Block format 'qcow2' does not support the option 'unknown_opt'
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=on,if=none,id=drive0
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=on,if=none,id=drive0: Block format 'qcow2' used by device 'drive0' doesn't support the option 'unknown_opt'
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=on,if=none,id=drive0: Block format 'qcow2' does not support the option 'unknown_opt'
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=1234,if=none,id=drive0
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=1234,if=none,id=drive0: Block format 'qcow2' used by device 'drive0' doesn't support the option 'unknown_opt'
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=1234,if=none,id=drive0: Block format 'qcow2' does not support the option 'unknown_opt'
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=foo,if=none,id=drive0
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=foo,if=none,id=drive0: Block format 'qcow2' used by device 'drive0' doesn't support the option 'unknown_opt'
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=foo,if=none,id=drive0: Block format 'qcow2' does not support the option 'unknown_opt'
=== Unknown protocol option ===
diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
index 85fc05d..73cc15a 100644
--- a/tests/qemu-iotests/051.pc.out
+++ b/tests/qemu-iotests/051.pc.out
@@ -5,16 +5,16 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/
=== Unknown option ===
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=,if=none,id=drive0
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=,if=none,id=drive0: Block format 'qcow2' used by device 'drive0' doesn't support the option 'unknown_opt'
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=,if=none,id=drive0: Block format 'qcow2' does not support the option 'unknown_opt'
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=on,if=none,id=drive0
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=on,if=none,id=drive0: Block format 'qcow2' used by device 'drive0' doesn't support the option 'unknown_opt'
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=on,if=none,id=drive0: Block format 'qcow2' does not support the option 'unknown_opt'
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=1234,if=none,id=drive0
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=1234,if=none,id=drive0: Block format 'qcow2' used by device 'drive0' doesn't support the option 'unknown_opt'
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=1234,if=none,id=drive0: Block format 'qcow2' does not support the option 'unknown_opt'
Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=foo,if=none,id=drive0
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=foo,if=none,id=drive0: Block format 'qcow2' used by device 'drive0' doesn't support the option 'unknown_opt'
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=foo,if=none,id=drive0: Block format 'qcow2' does not support the option 'unknown_opt'
=== Unknown protocol option ===
--
1.8.3.1
next prev parent reply other threads:[~2016-03-17 15:57 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-17 15:56 [Qemu-devel] [PULL 00/29] Block patches Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 01/29] block: Fix qemu_root_bds_opts.head initialisation Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 02/29] block: Fix memory leak in hmp_drive_add_node() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 03/29] monitor: Use BB list for BB name completion Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 04/29] block: Use blk_next() in block-backend.c Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 05/29] block: Add blk_commit_all() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 06/29] block: Use blk_{commit, flush}_all() consistently Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 07/29] qapi: Drop QERR_UNKNOWN_BLOCK_FORMAT_FEATURE Kevin Wolf
2016-03-17 15:56 ` Kevin Wolf [this message]
2016-03-17 15:56 ` [Qemu-devel] [PULL 09/29] blockdev: Rename blk_backends Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 10/29] blockdev: Add list of all BlockBackends Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 11/29] blockdev: Separate BB name management Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 12/29] blockdev: Split monitor reference from BB creation Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 13/29] blockdev: Remove blk_hide_on_behalf_of_hmp_drive_del() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 14/29] block: Move some bdrv_*_all() functions to BB Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 15/29] block: Add bdrv_next_monitor_owned() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 16/29] block: Add blk_next_root_bs() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 17/29] block: Rewrite bdrv_next() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 18/29] block: Use bdrv_next() instead of bdrv_states Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 19/29] block: Remove bdrv_states list Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 20/29] block: Use BdrvChild in BlockBackend Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 21/29] block: Use blk_co_preadv() for blk_read() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 22/29] block: Use blk_co_pwritev() for blk_write() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 23/29] block: Pull up blk_read_unthrottled() implementation Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 24/29] block: Use blk_co_pwritev() in blk_write_zeroes() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 25/29] block: Use blk_prw() in blk_pread()/blk_pwrite() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 26/29] block: Use blk_aio_prwv() for aio_read/write/write_zeroes Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 27/29] block: Use blk_co_pwritev() in blk_co_write_zeroes() Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 28/29] quorum: Emit QUORUM_REPORT_BAD for reads in fifo mode Kevin Wolf
2016-03-17 15:56 ` [Qemu-devel] [PULL 29/29] iotests: Test QUORUM_REPORT_BAD " Kevin Wolf
2016-03-17 16:46 ` [Qemu-devel] [PULL 00/29] Block patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458230202-29136-9-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).