[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/24] block: directly invoke .bdrv_* from emulation
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 13/24] block: directly invoke .bdrv_* from emulation functions |
Date: |
Fri, 14 Oct 2011 18:49:08 +0200 |
From: Stefan Hajnoczi <address@hidden>
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>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index 09f8aad..7c01f72 100644
--- a/block.c
+++ b/block.c
@@ -2739,9 +2739,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);
@@ -2906,8 +2906,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;
@@ -2934,8 +2935,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.4
- [Qemu-devel] [PULL 00/24] Block patches, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 01/24] block: allow resizing of images residing on host devices, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 02/24] linux-aio: Fix laio_submit error handling, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 03/24] block: Keep track of devices' I/O status, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 04/24] virtio: Support I/O status, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 05/24] ide: Support I/O status, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 07/24] QMP: query-status: Add 'io-status' key, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 08/24] HMP: Print 'io-status' information, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 09/24] block/vvfat: Fix potential memory leaks and other memory errors, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 06/24] scsi: Support I/O status, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 13/24] block: directly invoke .bdrv_* from emulation functions,
Kevin Wolf <=
- [Qemu-devel] [PATCH 11/24] vvfat: Fix potential buffer overflow, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 10/24] block/vvfat: Remove unused code, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 12/24] block: directly invoke .bdrv_aio_*() in bdrv_co_io_em(), Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 14/24] block: split out bdrv_co_do_readv() and bdrv_co_do_writev(), Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 15/24] block: switch bdrv_read()/bdrv_write() to coroutines, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 17/24] block: mark blocks dirty on coroutine write completion, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 16/24] block: switch bdrv_aio_readv() to coroutines, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 18/24] block: switch bdrv_aio_writev() to coroutines, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 19/24] linux-aio: Allow reads beyond the end of growable images, Kevin Wolf, 2011/10/14