From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL 18/20] blkdebug: Inject errors on .bdrv_co_block_status()
Date: Fri, 14 Jun 2019 15:40:19 +0200 [thread overview]
Message-ID: <20190614134021.32486-19-mreitz@redhat.com> (raw)
In-Reply-To: <20190614134021.32486-1-mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190507203508.18026-6-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
qapi/block-core.json | 5 ++++-
block/blkdebug.c | 8 ++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 60f903afa3..61124431d8 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3281,10 +3281,13 @@
#
# @flush: .bdrv_co_flush_to_disk()
#
+# @block-status: .bdrv_co_block_status()
+#
# Since: 4.1
##
{ 'enum': 'BlkdebugIOType', 'prefix': 'BLKDEBUG_IO_TYPE',
- 'data': [ 'read', 'write', 'write-zeroes', 'discard', 'flush' ] }
+ 'data': [ 'read', 'write', 'write-zeroes', 'discard', 'flush',
+ 'block-status' ] }
##
# @BlkdebugInjectErrorOptions:
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 1663ed25af..5ae96c52b0 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -670,7 +670,15 @@ static int coroutine_fn blkdebug_co_block_status(BlockDriverState *bs,
int64_t *map,
BlockDriverState **file)
{
+ int err;
+
assert(QEMU_IS_ALIGNED(offset | bytes, bs->bl.request_alignment));
+
+ err = rule_check(bs, offset, bytes, BLKDEBUG_IO_TYPE_BLOCK_STATUS);
+ if (err) {
+ return err;
+ }
+
return bdrv_co_block_status_from_file(bs, want_zero, offset, bytes,
pnum, map, file);
}
--
2.21.0
next prev parent reply other threads:[~2019-06-14 14:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-14 13:40 [Qemu-devel] [PULL 00/20] Block patches Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 01/20] blockdev-backup: don't check aio_context too early Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 02/20] iotests.py: do not use infinite waits Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 03/20] QEMUMachine: add events_wait method Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 04/20] iotests.py: rewrite run_job to be pickier Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 05/20] iotests: add iotest 256 for testing blockdev-backup across iothread contexts Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 06/20] event_match: always match on None value Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 07/20] iotests: Filter 175's allocation information Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 08/20] iotests: Fix intermittent failure in 219 Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 09/20] hw/block/fdc: floppy command FIFO memory initialization Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 10/20] iotests: restrict 254 to support only qcow2 Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 11/20] qemu-img: Fix options leakage in img_rebase() Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 12/20] qapi/block-core: Overlays are not snapshots Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 13/20] blockdev: " Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 14/20] qemu-img: Move quiet into ImgConvertState Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 15/20] qemu-img: Add salvaging mode to convert Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 16/20] blkdebug: Add @iotype error option Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 17/20] blkdebug: Add "none" event Max Reitz
2019-06-14 13:40 ` Max Reitz [this message]
2019-06-14 13:40 ` [Qemu-devel] [PULL 19/20] iotests: Test qemu-img convert --salvage Max Reitz
2019-06-14 13:40 ` [Qemu-devel] [PULL 20/20] iotests: Test qemu-img convert -C --salvage Max Reitz
2019-06-14 14:51 ` [Qemu-devel] [PULL 00/20] 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=20190614134021.32486-19-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--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).