Am 17.10.2018 um 10:26 hat Markus Armbruster geschrieben:
> Calling error_report() in a function that takes an Error ** argument
> is suspicious. Convert a few that are actually warnings to
> warn_report().
>
> While there, split warnings consisting of multiple sentences to
> conform to conventions spelled out in warn_report()'s contract, and
> improve a rather useless warning in sheepdog.c.
>
> Cc: Kevin Wolf <kw...@redhat.com>
> Cc: Ronnie Sahlberg <ronniesahlb...@gmail.com>
> Cc: Paolo Bonzini <pbonz...@redhat.com>
> Cc: Peter Lieven <p...@kamp.de>
> Cc: Hitoshi Mitake <mitake.hito...@lab.ntt.co.jp>
> Cc: Liu Yuan <namei.u...@gmail.com>
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
> Reviewed-by: Eric Blake <ebl...@redhat.com>
> ---
> block/bochs.c | 8 ++++----
> block/cloop.c | 8 ++++----
> block/dmg.c | 8 ++++----
> block/iscsi.c | 2 +-
> block/rbd.c | 12 ++++++------
> block/sheepdog.c | 2 +-
> block/vvfat.c | 8 ++++----
> 7 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/block/bochs.c b/block/bochs.c
> index 50c630047b..36c1b45bd2 100644
> --- a/block/bochs.c
> +++ b/block/bochs.c
> @@ -112,10 +112,10 @@ static int bochs_open(BlockDriverState *bs, QDict
> *options, int flags,
> }
>
> if (!bdrv_is_read_only(bs)) {
> - error_report("Opening bochs images without an explicit read-only=on "
> - "option is deprecated. Future versions will refuse to "
> - "open the image instead of automatically marking the "
> - "image read-only.");
> + warn_report("Opening bochs images without an explicit read-only=on "
> + "option is deprecated");
> + error_printf("Future versions may refuse to open the image "
> + "instead of automatically marking it read-only.\n");
> ret = bdrv_set_read_only(bs, true, errp); /* no write support yet */
> if (ret < 0) {
> return ret;
While I agree with your intention, it would be best to leave all of the
!bdrv_is_read_only() warnings alone. My series "[PATCH v2 0/8] block:
Add auto-read-only option" gets rid of the message entirely, so this
would only add a merge conflict.
Kevin
