[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 30/43] block: Convert bdrv_co_writev() to BdrvChild
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 30/43] block: Convert bdrv_co_writev() to BdrvChild |
Date: |
Tue, 5 Jul 2016 17:50:39 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Acked-by: Stefan Hajnoczi <address@hidden>
---
block/crypto.c | 2 +-
block/io.c | 6 +++---
block/parallels.c | 2 +-
block/qcow.c | 2 +-
block/vhdx.c | 2 +-
include/block/block.h | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index 87b1e00..64bf095 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -507,7 +507,7 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t
sector_num,
qemu_iovec_reset(&hd_qiov);
qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * 512);
- ret = bdrv_co_writev(bs->file->bs,
+ ret = bdrv_co_writev(bs->file,
payload_offset + sector_num,
cur_nr_sectors, &hd_qiov);
if (ret < 0) {
diff --git a/block/io.c b/block/io.c
index c988e1b..17e4ad4 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1547,12 +1547,12 @@ static int coroutine_fn
bdrv_co_do_writev(BlockDriverState *bs,
nb_sectors << BDRV_SECTOR_BITS, qiov, flags);
}
-int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_num,
+int coroutine_fn bdrv_co_writev(BdrvChild *child, int64_t sector_num,
int nb_sectors, QEMUIOVector *qiov)
{
- trace_bdrv_co_writev(bs, sector_num, nb_sectors);
+ trace_bdrv_co_writev(child->bs, sector_num, nb_sectors);
- return bdrv_co_do_writev(bs, sector_num, nb_sectors, qiov, 0);
+ return bdrv_co_do_writev(child->bs, sector_num, nb_sectors, qiov, 0);
}
int coroutine_fn bdrv_co_pwrite_zeroes(BlockDriverState *bs,
diff --git a/block/parallels.c b/block/parallels.c
index 7da01fb..91ab61f 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -311,7 +311,7 @@ static coroutine_fn int
parallels_co_writev(BlockDriverState *bs,
qemu_iovec_reset(&hd_qiov);
qemu_iovec_concat(&hd_qiov, qiov, bytes_done, nbytes);
- ret = bdrv_co_writev(bs->file->bs, position, n, &hd_qiov);
+ ret = bdrv_co_writev(bs->file, position, n, &hd_qiov);
if (ret < 0) {
break;
}
diff --git a/block/qcow.c b/block/qcow.c
index c8d4e5f..0db43f8 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -745,7 +745,7 @@ static coroutine_fn int qcow_co_writev(BlockDriverState
*bs, int64_t sector_num,
hd_iov.iov_len = n * 512;
qemu_iovec_init_external(&hd_qiov, &hd_iov, 1);
qemu_co_mutex_unlock(&s->lock);
- ret = bdrv_co_writev(bs->file->bs,
+ ret = bdrv_co_writev(bs->file,
(cluster_offset >> 9) + index_in_cluster,
n, &hd_qiov);
qemu_co_mutex_lock(&s->lock);
diff --git a/block/vhdx.c b/block/vhdx.c
index cca2540..b0f66de 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -1326,7 +1326,7 @@ static coroutine_fn int vhdx_co_writev(BlockDriverState
*bs, int64_t sector_num,
}
/* block exists, so we can just overwrite it */
qemu_co_mutex_unlock(&s->lock);
- ret = bdrv_co_writev(bs->file->bs,
+ ret = bdrv_co_writev(bs->file,
sinfo.file_offset >> BDRV_SECTOR_BITS,
sectors_to_write, &hd_qiov);
qemu_co_mutex_lock(&s->lock);
diff --git a/include/block/block.h b/include/block/block.h
index 16ec088..70b1b80 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -243,8 +243,8 @@ int bdrv_pwrite_sync(BlockDriverState *bs, int64_t offset,
const void *buf, int count);
int coroutine_fn bdrv_co_readv(BdrvChild *child, int64_t sector_num,
int nb_sectors, QEMUIOVector *qiov);
-int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_num,
- int nb_sectors, QEMUIOVector *qiov);
+int coroutine_fn bdrv_co_writev(BdrvChild *child, int64_t sector_num,
+ int nb_sectors, QEMUIOVector *qiov);
/*
* Efficiently zero a region of the disk image. Note that this is a regular
* I/O request like read or write and should have a reasonable size. This
--
1.8.3.1
- [Qemu-block] [PULL 22/43] block: Fix error message style, (continued)
- [Qemu-block] [PULL 22/43] block: Fix error message style, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 24/43] block: fix return code for partial write for Linux AIO, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 23/43] block: Use bool as appropriate for BDS members, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 25/43] block/qdev: Fix NULL access when using BB twice, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 27/43] blkreplay: Convert to byte-based I/O, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 26/43] vvfat: Use BdrvChild for s->qcow, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 28/43] vhdx: Some more BlockBackend use in vhdx_create(), Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 29/43] block: Convert bdrv_co_readv() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 31/43] block: Convert bdrv_aio_readv() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 30/43] block: Convert bdrv_co_writev() to BdrvChild,
Kevin Wolf <=
- [Qemu-block] [PULL 32/43] block: Convert bdrv_aio_writev() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 33/43] block: Convert bdrv_co_do_readv/writev to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 34/43] block: Move bdrv_commit() to block/commit.c, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 35/43] block: Use BlockBackend for I/O in bdrv_commit(), Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 36/43] block: Convert bdrv_read() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 37/43] block: Convert bdrv_write() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 41/43] block: Convert bdrv_prwv_co() to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 39/43] block: Convert bdrv_pwrite(v/_sync) to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 38/43] block: Convert bdrv_pread(v) to BdrvChild, Kevin Wolf, 2016/07/05
- [Qemu-block] [PULL 40/43] block: Convert bdrv_pwrite_zeroes() to BdrvChild, Kevin Wolf, 2016/07/05