From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v4 37/38] raw: Convert a warning to warn_report()
Date: Wed, 17 Oct 2018 10:27:01 +0200 [thread overview]
Message-ID: <20181017082702.5581-38-armbru@redhat.com> (raw)
In-Reply-To: <20181017082702.5581-1-armbru@redhat.com>
Convert the warning about dangerous automatic probing of raw images to
warn_report(). Split its text to conform to conventions spelled out
in warn_report()'s contract.
Update expected output of qemu-iotest 109 accordingly. Update
qemu-iotest 099's output filtering to keep filtering out the warning.
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
block/raw-format.c | 17 ++++++------
tests/qemu-iotests/099 | 3 ++-
tests/qemu-iotests/109.out | 55 +++++++++++++++++++++++---------------
3 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/block/raw-format.c b/block/raw-format.c
index 6f6dc99b2c..d65fd0ffce 100644
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -29,6 +29,7 @@
#include "qemu/osdep.h"
#include "block/block_int.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "qemu/option.h"
typedef struct BDRVRawState {
@@ -436,14 +437,14 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags,
bs->file->bs->supported_zero_flags);
if (bs->probed && !bdrv_is_read_only(bs)) {
- fprintf(stderr,
- "WARNING: Image format was not specified for '%s' and probing "
- "guessed raw.\n"
- " Automatically detecting the format is dangerous for "
- "raw images, write operations on block 0 will be restricted.\n"
- " Specify the 'raw' format explicitly to remove the "
- "restrictions.\n",
- bs->file->bs->filename);
+ warn_report("Image format was not specified for '%s' and probing "
+ "guessed raw",
+ bs->file->bs->filename);
+ error_printf("Automatically detecting the format is dangerous for "
+ "raw images, write\n"
+ "operations on block 0 will be restricted.\n"
+ "Specify the 'raw' format explicitly to remove the "
+ "restrictions.\n");
}
ret = raw_read_options(options, bs, s, errp);
diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
index caaf58eee5..f2a62448d8 100755
--- a/tests/qemu-iotests/099
+++ b/tests/qemu-iotests/099
@@ -57,7 +57,8 @@ function run_qemu()
# which is how we can extract it)
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_imgfmt | _filter_qmp \
| _filter_qemu | grep "drv0" \
- | sed -e 's/^.*"file": "\(\(\\"\|[^"]\)*\)".*$/\1/' -e 's/\\"/"/g'
+ | sed -e 's/^.*"file": "\(\(\\"\|[^"]\)*\)".*$/\1/' -e 's/\\"/"/g' \
+ -e '/probing guessed raw/d'
}
function test_qemu()
diff --git a/tests/qemu-iotests/109.out b/tests/qemu-iotests/109.out
index ad0ee6fb48..99add53271 100644
--- a/tests/qemu-iotests/109.out
+++ b/tests/qemu-iotests/109.out
@@ -5,8 +5,9 @@ QA output created by 109
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
@@ -43,8 +44,9 @@ Images are identical.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
@@ -81,8 +83,9 @@ Images are identical.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
@@ -119,8 +122,9 @@ Images are identical.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
@@ -157,8 +161,9 @@ Images are identical.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
@@ -195,8 +200,9 @@ Images are identical.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
@@ -232,8 +238,9 @@ Images are identical.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
@@ -269,8 +276,9 @@ Images are identical.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
@@ -306,8 +314,9 @@ Images are identical.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
@@ -343,8 +352,9 @@ Images are identical.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
@@ -380,8 +390,9 @@ Images are identical.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
{"return": {}}
-WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
- Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
+warning: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw
+Automatically detecting the format is dangerous for raw images, write
+operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions.
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
--
2.17.1
next prev parent reply other threads:[~2018-10-17 8:27 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 8:26 [Qemu-devel] [PATCH v4 00/38] Replace some unwise uses of error_report() & friends Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 01/38] error: Fix use of error_prepend() with &error_fatal, &error_abort Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 02/38] Use error_fatal to simplify obvious fatal errors (again) Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 03/38] block: Use warn_report() & friends to report warnings Markus Armbruster
2018-10-17 13:50 ` Kevin Wolf
2018-10-17 17:29 ` Markus Armbruster
2018-10-18 11:10 ` Kevin Wolf
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 04/38] cpus hw target: " Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 05/38] vfio: " Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 06/38] vfio: Clean up error reporting after previous commit Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 07/38] char: Use error_printf() to print help and such Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 08/38] 9pfs: Fix CLI parsing crash on error Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 09/38] pc: Fix machine property nvdimm-persistence error handling Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 10/38] ioapic: Fix error handling in realize() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 11/38] smbios: Clean up error handling in smbios_add() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 12/38] migration: Fix !replay_can_snapshot() error handling Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 13/38] l2tpv3: Improve -netdev/netdev_add/-net/... error reporting Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 14/38] net/socket: Fix invalid socket type error handling Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 15/38] numa: Fix QMP command set-numa-node " Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 16/38] xen/pt: Fix incomplete conversion to realize() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 17/38] seccomp: Clean up error reporting in parse_sandbox() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 18/38] vl: Clean up error reporting in parse_add_fd() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 19/38] qom: Clean up error reporting in user_creatable_add_opts_foreach() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 20/38] vl: Clean up error reporting in chardev_init_func() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 21/38] vl: Clean up error reporting in machine_set_property() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 22/38] vl: Clean up error reporting in mon_init_func() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 23/38] vl: Clean up error reporting in parse_fw_cfg() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 24/38] vl: Clean up error reporting in device_init_func() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 25/38] ui/keymaps: Fix handling of erroneous include files Markus Armbruster
2018-10-19 6:49 ` Gerd Hoffmann
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 26/38] ui: Convert vnc_display_init(), init_keyboard_layout() to Error Markus Armbruster
2018-10-19 6:51 ` Gerd Hoffmann
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 27/38] vnc: Clean up error reporting in vnc_init_func() Markus Armbruster
2018-10-19 6:52 ` Gerd Hoffmann
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 28/38] numa: Clean up error reporting in parse_numa() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 29/38] tpm: Clean up error reporting in tpm_init_tpmdev() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 30/38] spice: Clean up error reporting in add_channel() Markus Armbruster
2018-10-19 6:53 ` Gerd Hoffmann
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 31/38] fsdev: Clean up error reporting in qemu_fsdev_add() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 32/38] vl: Assert drive_new() does not fail in default_drive() Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 33/38] blockdev: Convert drive_new() to Error Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 34/38] vl: Fix exit status for -drive format=help Markus Armbruster
2018-10-17 8:26 ` [Qemu-devel] [PATCH v4 35/38] vl: Simplify call of parse_name() Markus Armbruster
2018-10-17 8:27 ` [Qemu-devel] [PATCH v4 36/38] block: Clean up bdrv_img_create()'s error reporting Markus Armbruster
2018-10-17 13:47 ` Kevin Wolf
2018-10-17 8:27 ` Markus Armbruster [this message]
2018-10-17 13:45 ` [Qemu-devel] [PATCH v4 37/38] raw: Convert a warning to warn_report() Kevin Wolf
2018-10-17 17:34 ` Markus Armbruster
2018-10-19 9:37 ` Markus Armbruster
2018-10-17 8:27 ` [Qemu-devel] [PATCH v4 38/38] vpc: Fail open on bad header checksum Markus Armbruster
2018-10-17 13:10 ` Kevin Wolf
2018-10-17 17:34 ` Markus Armbruster
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=20181017082702.5581-38-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--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).