qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v4 5/7] blkdebug: Inject errors on .bdrv_co_block_status()
Date: Tue,  7 May 2019 22:35:06 +0200	[thread overview]
Message-ID: <20190507203508.18026-6-mreitz@redhat.com> (raw)
In-Reply-To: <20190507203508.18026-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>
---
 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 54c927f1ad..028e4d6e02 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3252,10 +3252,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.20.1



  parent reply	other threads:[~2019-05-07 20:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-07 20:35 [Qemu-devel] [PATCH v4 0/7] qemu-img: Add salvaging mode to convert Max Reitz
2019-05-07 20:35 ` [Qemu-devel] [PATCH v4 1/7] qemu-img: Move quiet into ImgConvertState Max Reitz
2019-05-07 20:35 ` [Qemu-devel] [PATCH v4 2/7] qemu-img: Add salvaging mode to convert Max Reitz
2019-05-07 20:35 ` [Qemu-devel] [PATCH v4 3/7] blkdebug: Add @iotype error option Max Reitz
2019-05-07 20:35 ` [Qemu-devel] [PATCH v4 4/7] blkdebug: Add "none" event Max Reitz
2019-05-07 20:35 ` Max Reitz [this message]
2019-05-07 20:35 ` [Qemu-devel] [PATCH v4 6/7] iotests: Test qemu-img convert --salvage Max Reitz
2019-05-16 14:40   ` Vladimir Sementsov-Ogievskiy
2019-05-16 14:51     ` Max Reitz
2019-05-07 20:35 ` [Qemu-devel] [PATCH v4 7/7] iotests: Test qemu-img convert -C --salvage Max Reitz
2019-06-13 19:52 ` [Qemu-devel] [PATCH v4 0/7] qemu-img: Add salvaging mode to convert Max Reitz

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=20190507203508.18026-6-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=vsementsov@virtuozzo.com \
    /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).