From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org,
vsementsov@virtuozzo.com, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v6 13/20] raw: Switch to .bdrv_co_block_status()
Date: Thu, 7 Dec 2017 14:30:29 -0600 [thread overview]
Message-ID: <20171207203036.14993-14-eblake@redhat.com> (raw)
In-Reply-To: <20171207203036.14993-1-eblake@redhat.com>
We are gradually moving away from sector-based interfaces, towards
byte-based. Update the raw driver accordingly.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
v5: no change
v4: rebase to interface tweak
v3: no change
v2: rebase to mapping
---
block/raw-format.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/block/raw-format.c b/block/raw-format.c
index ab552c0954..830243a8e4 100644
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -250,17 +250,17 @@ fail:
return ret;
}
-static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
- int64_t sector_num,
- int nb_sectors, int *pnum,
+static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
+ bool want_zero, int64_t offset,
+ int64_t bytes, int64_t *pnum,
+ int64_t *map,
BlockDriverState **file)
{
BDRVRawState *s = bs->opaque;
- *pnum = nb_sectors;
+ *pnum = bytes;
*file = bs->file->bs;
- sector_num += s->offset / BDRV_SECTOR_SIZE;
- return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
- (sector_num << BDRV_SECTOR_BITS);
+ *map = offset + s->offset;
+ return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID;
}
static int coroutine_fn raw_co_pwrite_zeroes(BlockDriverState *bs,
@@ -496,7 +496,7 @@ BlockDriver bdrv_raw = {
.bdrv_co_pwritev = &raw_co_pwritev,
.bdrv_co_pwrite_zeroes = &raw_co_pwrite_zeroes,
.bdrv_co_pdiscard = &raw_co_pdiscard,
- .bdrv_co_get_block_status = &raw_co_get_block_status,
+ .bdrv_co_block_status = &raw_co_block_status,
.bdrv_truncate = &raw_truncate,
.bdrv_getlength = &raw_getlength,
.has_variable_length = true,
--
2.14.3
next prev parent reply other threads:[~2017-12-07 20:32 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 20:30 [Qemu-devel] [PATCH v6 00/20] add byte-based block_status driver callbacks Eric Blake
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 01/20] block: Add .bdrv_co_block_status() callback Eric Blake
2017-12-09 10:15 ` Vladimir Sementsov-Ogievskiy
2017-12-09 13:26 ` Vladimir Sementsov-Ogievskiy
2017-12-29 2:35 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 02/20] block: Switch passthrough drivers to .bdrv_co_block_status() Eric Blake
2017-12-29 2:37 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 03/20] file-posix: Switch " Eric Blake
2017-12-09 11:52 ` Vladimir Sementsov-Ogievskiy
2017-12-29 2:41 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 04/20] gluster: " Eric Blake
2017-12-09 11:55 ` Vladimir Sementsov-Ogievskiy
2017-12-29 2:42 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 05/20] iscsi: Switch cluster_sectors to byte-based Eric Blake
2017-12-29 2:49 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 06/20] iscsi: Switch iscsi_allocmap_update() " Eric Blake
2017-12-29 3:25 ` Fam Zheng
2018-01-02 21:43 ` [Qemu-devel] [Qemu-block] " Jeff Cody
2018-01-02 22:36 ` Eric Blake
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 07/20] iscsi: Switch to .bdrv_co_block_status() Eric Blake
2017-12-29 3:20 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 08/20] null: " Eric Blake
2017-12-29 2:56 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 09/20] parallels: " Eric Blake
2017-12-09 12:31 ` Vladimir Sementsov-Ogievskiy
2017-12-09 16:39 ` Eric Blake
2017-12-11 9:14 ` Vladimir Sementsov-Ogievskiy
2017-12-11 15:24 ` Vladimir Sementsov-Ogievskiy
2017-12-12 16:32 ` Eric Blake
2017-12-12 16:49 ` Vladimir Sementsov-Ogievskiy
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 10/20] qcow: " Eric Blake
2017-12-29 3:00 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 11/20] qcow2: " Eric Blake
2017-12-29 3:01 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 12/20] qed: " Eric Blake
2017-12-29 3:06 ` Fam Zheng
2017-12-07 20:30 ` Eric Blake [this message]
2017-12-29 3:07 ` [Qemu-devel] [PATCH v6 13/20] raw: " Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 14/20] sheepdog: " Eric Blake
2017-12-29 3:08 ` Fam Zheng
2018-01-02 21:52 ` Jeff Cody
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 15/20] vdi: Avoid bitrot of debugging code Eric Blake
2017-12-29 3:09 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 16/20] vdi: Switch to .bdrv_co_block_status() Eric Blake
2017-12-29 3:10 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 17/20] vmdk: " Eric Blake
2017-12-09 12:36 ` Vladimir Sementsov-Ogievskiy
2017-12-29 3:16 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 18/20] vpc: " Eric Blake
2017-12-09 13:42 ` Vladimir Sementsov-Ogievskiy
2017-12-29 2:55 ` Fam Zheng
2018-01-02 20:30 ` Eric Blake
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 19/20] vvfat: " Eric Blake
2017-12-29 3:26 ` Fam Zheng
2017-12-07 20:30 ` [Qemu-devel] [PATCH v6 20/20] block: Drop unused .bdrv_co_get_block_status() Eric Blake
2017-12-09 13:23 ` Vladimir Sementsov-Ogievskiy
2017-12-29 3:27 ` Fam Zheng
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=20171207203036.14993-14-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=famz@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@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).