From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kVk-0004j2-KL for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:25:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6kVf-0008W9-5C for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:25:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39052) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kVe-0008UD-J0 for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:25:38 -0500 From: Kevin Wolf Date: Fri, 24 Jan 2014 18:22:00 +0100 Message-Id: <1390584136-24703-78-git-send-email-kwolf@redhat.com> In-Reply-To: <1390584136-24703-1-git-send-email-kwolf@redhat.com> References: <1390584136-24703-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 77/93] block: Introduce bdrv_co_do_pwritev() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org This is going to become the bdrv_co_do_preadv() equivalent for writes. In this patch, however, just a function taking byte offsets is created, it doesn't align anything yet. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Reviewed-by: Benoit Canet --- block.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 20a3853..576859e 100644 --- a/block.c +++ b/block.c @@ -3196,8 +3196,8 @@ static int coroutine_fn bdrv_aligned_pwritev(BlockDriverState *bs, /* * Handle a write request in coroutine context */ -static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, - int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, +static int coroutine_fn bdrv_co_do_pwritev(BlockDriverState *bs, + int64_t offset, unsigned int bytes, QEMUIOVector *qiov, BdrvRequestFlags flags) { int ret; @@ -3208,21 +3208,33 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, if (bs->read_only) { return -EACCES; } - if (bdrv_check_request(bs, sector_num, nb_sectors)) { + if (bdrv_check_byte_request(bs, offset, bytes)) { return -EIO; } /* throttling disk I/O */ if (bs->io_limits_enabled) { - bdrv_io_limits_intercept(bs, nb_sectors, true); + /* TODO Switch to byte granularity */ + bdrv_io_limits_intercept(bs, bytes >> BDRV_SECTOR_BITS, true); } - ret = bdrv_aligned_pwritev(bs, sector_num << BDRV_SECTOR_BITS, - nb_sectors << BDRV_SECTOR_BITS, qiov, flags); + ret = bdrv_aligned_pwritev(bs, offset, bytes, qiov, flags); return ret; } +static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, + int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, + BdrvRequestFlags flags) +{ + if (nb_sectors < 0 || nb_sectors > (INT_MAX >> BDRV_SECTOR_BITS)) { + return -EINVAL; + } + + return bdrv_co_do_pwritev(bs, sector_num << BDRV_SECTOR_BITS, + nb_sectors << BDRV_SECTOR_BITS, qiov, flags); +} + int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov) { -- 1.8.1.4