[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/5] block: directly invoke .bdrv_* from emulatio
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v2 1/5] block: directly invoke .bdrv_* from emulation functions |
Date: |
Thu, 13 Oct 2011 13:08:21 +0100 |
The emulation functions which supply default BlockDriver .bdrv_*()
functions given another implemented .bdrv_*() function should not use
public bdrv_*() interfaces. This patch ensures they invoke .bdrv_*()
directly to avoid adding an extra layer of coroutine request processing
and possibly entering an infinite loop.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index 62903dd..f4731ec 100644
--- a/block.c
+++ b/block.c
@@ -2759,9 +2759,9 @@ static BlockDriverAIOCB
*bdrv_aio_rw_vector(BlockDriverState *bs,
if (is_write) {
qemu_iovec_to_buffer(acb->qiov, acb->bounce);
- acb->ret = bdrv_write(bs, sector_num, acb->bounce, nb_sectors);
+ acb->ret = bs->drv->bdrv_write(bs, sector_num, acb->bounce,
nb_sectors);
} else {
- acb->ret = bdrv_read(bs, sector_num, acb->bounce, nb_sectors);
+ acb->ret = bs->drv->bdrv_read(bs, sector_num, acb->bounce, nb_sectors);
}
qemu_bh_schedule(acb->bh);
@@ -2926,8 +2926,9 @@ static int bdrv_read_em(BlockDriverState *bs, int64_t
sector_num,
iov.iov_base = (void *)buf;
iov.iov_len = nb_sectors * BDRV_SECTOR_SIZE;
qemu_iovec_init_external(&qiov, &iov, 1);
- acb = bdrv_aio_readv(bs, sector_num, &qiov, nb_sectors,
- bdrv_rw_em_cb, &async_ret);
+
+ acb = bs->drv->bdrv_aio_readv(bs, sector_num, &qiov, nb_sectors,
+ bdrv_rw_em_cb, &async_ret);
if (acb == NULL) {
async_ret = -1;
goto fail;
@@ -2954,8 +2955,9 @@ static int bdrv_write_em(BlockDriverState *bs, int64_t
sector_num,
iov.iov_base = (void *)buf;
iov.iov_len = nb_sectors * BDRV_SECTOR_SIZE;
qemu_iovec_init_external(&qiov, &iov, 1);
- acb = bdrv_aio_writev(bs, sector_num, &qiov, nb_sectors,
- bdrv_rw_em_cb, &async_ret);
+
+ acb = bs->drv->bdrv_aio_writev(bs, sector_num, &qiov, nb_sectors,
+ bdrv_rw_em_cb, &async_ret);
if (acb == NULL) {
async_ret = -1;
goto fail;
--
1.7.6.3
- [Qemu-devel] [PATCH v2 0/5] block: do request processing in a coroutine, Stefan Hajnoczi, 2011/10/13
- [Qemu-devel] [PATCH v2 4/5] block: mark blocks dirty on coroutine write completion, Stefan Hajnoczi, 2011/10/13
- [Qemu-devel] [PATCH v2 5/5] block: switch bdrv_aio_writev() to coroutines, Stefan Hajnoczi, 2011/10/13
- [Qemu-devel] [PATCH v2 2/5] block: switch bdrv_read()/bdrv_write() to coroutines, Stefan Hajnoczi, 2011/10/13
- [Qemu-devel] [PATCH v2 1/5] block: directly invoke .bdrv_* from emulation functions,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v2 3/5] block: switch bdrv_aio_readv() to coroutines, Stefan Hajnoczi, 2011/10/13
- Re: [Qemu-devel] [PATCH v2 0/5] block: do request processing in a coroutine, Kevin Wolf, 2011/10/13