From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 08/12] block: Request block status from *file for BDRV_BLOCK_RAW
Date: Mon, 13 Mar 2017 15:55:04 +0100 [thread overview]
Message-ID: <1489416908-3771-9-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1489416908-3771-1-git-send-email-kwolf@redhat.com>
This fixes bdrv_co_get_block_status() for the bdrv_mirror_top block
driver, which must fall through to bs->backing instead of bs->file.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
block/io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/io.c b/block/io.c
index 8f38d46..2709a70 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1760,7 +1760,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs,
if (ret & BDRV_BLOCK_RAW) {
assert(ret & BDRV_BLOCK_OFFSET_VALID);
- ret = bdrv_get_block_status(bs->file->bs, ret >> BDRV_SECTOR_BITS,
+ ret = bdrv_get_block_status(*file, ret >> BDRV_SECTOR_BITS,
*pnum, pnum, file);
goto out;
}
--
1.8.3.1
next prev parent reply other threads:[~2017-03-13 14:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-13 14:54 [Qemu-devel] [PULL 00/12] Block layer fixes for 2.9.0-rc1 Kevin Wolf
2017-03-13 14:54 ` [Qemu-devel] [PULL 01/12] backup: allow target without .bdrv_get_info Kevin Wolf
2017-03-13 14:54 ` [Qemu-devel] [PULL 02/12] file-posix: Consider max_segments for BlockLimits.max_transfer Kevin Wolf
2017-03-13 14:54 ` [Qemu-devel] [PULL 03/12] block: Drop unmaintained 'archipelago' driver Kevin Wolf
2017-03-13 14:55 ` [Qemu-devel] [PULL 04/12] backup: React to bdrv_is_allocated() errors Kevin Wolf
2017-03-13 14:55 ` [Qemu-devel] [PULL 05/12] vvfat: " Kevin Wolf
2017-03-13 14:55 ` [Qemu-devel] [PULL 06/12] migration: Document handling of " Kevin Wolf
2017-03-13 14:55 ` [Qemu-devel] [PULL 07/12] block: Remove check_new_perm from bdrv_replace_child() Kevin Wolf
2017-03-13 14:55 ` Kevin Wolf [this message]
2017-03-13 14:55 ` [Qemu-devel] [PULL 09/12] commit: Implement bdrv_commit_top.bdrv_co_get_block_status Kevin Wolf
2017-03-13 14:55 ` [Qemu-devel] [PULL 10/12] block: Refresh filename after changing backing file Kevin Wolf
2017-03-13 14:55 ` [Qemu-devel] [PULL 11/12] mirror: Implement .bdrv_refresh_filename Kevin Wolf
2017-03-13 14:55 ` [Qemu-devel] [PULL 12/12] commit: " Kevin Wolf
2017-03-13 18:05 ` [Qemu-devel] [PULL 00/12] Block layer fixes for 2.9.0-rc1 Peter Maydell
2017-03-14 9:29 ` Kevin Wolf
2017-03-14 9:51 ` 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=1489416908-3771-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).