From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxFot-0004nf-IG for qemu-devel@nongnu.org; Thu, 11 Jul 2013 08:18:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UxFoq-0005TN-Ea for qemu-devel@nongnu.org; Thu, 11 Jul 2013 08:17:59 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:34862 helo=mx01.kamp.de) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1UxFoq-0005T0-3D for qemu-devel@nongnu.org; Thu, 11 Jul 2013 08:17:56 -0400 From: Peter Lieven Date: Thu, 11 Jul 2013 14:16:26 +0200 Message-Id: <1373544987-20613-10-git-send-email-pl@kamp.de> In-Reply-To: <1373544987-20613-1-git-send-email-pl@kamp.de> References: <1373544987-20613-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv3 09/10] iscsi: remove support for misaligned nb_sectors in aio_readv List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, Peter Lieven , ronniesahlberg@gmail.com, stefanha@redhat.com this hask is not working (anymore). support for misaligned offsets should be handled at the block layer. Signed-off-by: Peter Lieven --- block/iscsi.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index bc62a7e..903f2fb 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -76,8 +76,6 @@ typedef struct IscsiAIOCB { int status; int canceled; int retries; - size_t read_size; - size_t read_offset; int64_t sector_num; int nb_sectors; #ifdef __linux__ @@ -435,6 +433,7 @@ static int iscsi_aio_readv_acb(IscsiAIOCB *acb) { struct iscsi_context *iscsi = acb->iscsilun->iscsi; + size_t size; uint64_t lba; uint32_t num_sectors; int ret; @@ -447,20 +446,7 @@ iscsi_aio_readv_acb(IscsiAIOCB *acb) acb->status = -EINPROGRESS; acb->buf = NULL; - /* If LUN blocksize is bigger than BDRV_BLOCK_SIZE a read from QEMU - * may be misaligned to the LUN, so we may need to read some extra - * data. - */ - acb->read_offset = 0; - if (acb->iscsilun->block_size > BDRV_SECTOR_SIZE) { - uint64_t bdrv_offset = BDRV_SECTOR_SIZE * acb->sector_num; - - acb->read_offset = bdrv_offset % acb->iscsilun->block_size; - } - - num_sectors = (acb->read_size + acb->iscsilun->block_size - + acb->read_offset - 1) - / acb->iscsilun->block_size; + size = acb->nb_sectors * BDRV_SECTOR_SIZE; acb->task = malloc(sizeof(struct scsi_task)); if (acb->task == NULL) { @@ -471,8 +457,9 @@ iscsi_aio_readv_acb(IscsiAIOCB *acb) memset(acb->task, 0, sizeof(struct scsi_task)); acb->task->xfer_dir = SCSI_XFER_READ; + acb->task->expxferlen = size; lba = sector_qemu2lun(acb->sector_num, acb->iscsilun); - acb->task->expxferlen = acb->read_size; + num_sectors = sector_qemu2lun(acb->nb_sectors, acb->iscsilun); switch (acb->iscsilun->type) { case TYPE_DISK: @@ -527,7 +514,6 @@ iscsi_aio_readv(BlockDriverState *bs, int64_t sector_num, acb->sector_num = sector_num; acb->iscsilun = iscsilun; acb->qiov = qiov; - acb->read_size = BDRV_SECTOR_SIZE * (size_t)acb->nb_sectors; acb->retries = ISCSI_CMD_RETRIES; if (iscsi_aio_readv_acb(acb) != 0) { -- 1.7.9.5