From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agaIm-00030K-5y for qemu-devel@nongnu.org; Thu, 17 Mar 2016 11:57:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agaIi-0001u5-JS for qemu-devel@nongnu.org; Thu, 17 Mar 2016 11:57:32 -0400 From: Kevin Wolf Date: Thu, 17 Mar 2016 16:56:37 +0100 Message-Id: <1458230202-29136-25-git-send-email-kwolf@redhat.com> In-Reply-To: <1458230202-29136-1-git-send-email-kwolf@redhat.com> References: <1458230202-29136-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 24/29] block: Use blk_co_pwritev() in blk_write_zeroes() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Signed-off-by: Kevin Wolf --- block/block-backend.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 475d27a..886c2f4 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -744,7 +744,8 @@ static void blk_write_entry(void *opaque) } static int blk_rw(BlockBackend *blk, int64_t sector_num, uint8_t *buf, - int nb_sectors, CoroutineEntry co_entry) + int nb_sectors, CoroutineEntry co_entry, + BdrvRequestFlags flags) { AioContext *aio_context; QEMUIOVector qiov; @@ -766,6 +767,7 @@ static int blk_rw(BlockBackend *blk, int64_t sector_num, uint8_t *buf, .blk = blk, .offset = sector_num << BDRV_SECTOR_BITS, .qiov = &qiov, + .flags = flags, .ret = NOT_DONE, }; @@ -783,7 +785,7 @@ static int blk_rw(BlockBackend *blk, int64_t sector_num, uint8_t *buf, int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf, int nb_sectors) { - return blk_rw(blk, sector_num, buf, nb_sectors, blk_read_entry); + return blk_rw(blk, sector_num, buf, nb_sectors, blk_read_entry, 0); } int blk_read_unthrottled(BlockBackend *blk, int64_t sector_num, uint8_t *buf, @@ -808,18 +810,15 @@ int blk_read_unthrottled(BlockBackend *blk, int64_t sector_num, uint8_t *buf, int blk_write(BlockBackend *blk, int64_t sector_num, const uint8_t *buf, int nb_sectors) { - return blk_rw(blk, sector_num, (uint8_t*) buf, nb_sectors, blk_write_entry); + return blk_rw(blk, sector_num, (uint8_t*) buf, nb_sectors, + blk_write_entry, 0); } int blk_write_zeroes(BlockBackend *blk, int64_t sector_num, int nb_sectors, BdrvRequestFlags flags) { - int ret = blk_check_request(blk, sector_num, nb_sectors); - if (ret < 0) { - return ret; - } - - return bdrv_write_zeroes(blk_bs(blk), sector_num, nb_sectors, flags); + return blk_rw(blk, sector_num, NULL, nb_sectors, blk_write_entry, + BDRV_REQ_ZERO_WRITE); } static void error_callback_bh(void *opaque) -- 1.8.3.1