From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UxFow-0004td-Mv for qemu-devel@nongnu.org; Thu, 11 Jul 2013 08:18:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UxFop-0005Sw-EW for qemu-devel@nongnu.org; Thu, 11 Jul 2013 08:18:02 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:57279 helo=mx01.kamp.de) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1UxFop-0005SY-2Z for qemu-devel@nongnu.org; Thu, 11 Jul 2013 08:17:55 -0400 From: Peter Lieven Date: Thu, 11 Jul 2013 14:16:25 +0200 Message-Id: <1373544987-20613-9-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 08/10] iscsi: factor out sector conversions 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 Reviewed-by: Kevin Wolf Signed-off-by: Peter Lieven --- block/iscsi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 6cdd182..bc62a7e 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -289,6 +289,11 @@ static int64_t sector_qemu2lun(int64_t sector, IscsiLun *iscsilun) return sector * BDRV_SECTOR_SIZE / iscsilun->block_size; } +static int64_t sector_lun2qemu(int64_t sector, IscsiLun *iscsilun) +{ + return sector * iscsilun->block_size / BDRV_SECTOR_SIZE; +} + static int iscsi_aio_writev_acb(IscsiAIOCB *acb) { @@ -336,7 +341,7 @@ iscsi_aio_writev_acb(IscsiAIOCB *acb) lba = sector_qemu2lun(acb->sector_num, acb->iscsilun); *(uint32_t *)&acb->task->cdb[2] = htonl(lba >> 32); *(uint32_t *)&acb->task->cdb[6] = htonl(lba & 0xffffffff); - num_sectors = size / acb->iscsilun->block_size; + num_sectors = sector_qemu2lun(acb->nb_sectors, acb->iscsilun); *(uint32_t *)&acb->task->cdb[10] = htonl(num_sectors); acb->task->expxferlen = size; @@ -836,7 +841,7 @@ retry: goto out; } - *pnum = lbasd->num_blocks * (iscsilun->block_size / BDRV_SECTOR_SIZE); + *pnum = sector_lun2qemu(lbasd->num_blocks, iscsilun); if (*pnum > nb_sectors) { *pnum = nb_sectors; } @@ -1272,8 +1277,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags) if ((ret = iscsi_readcapacity_sync(iscsilun)) != 0) { goto out; } - bs->total_sectors = iscsilun->num_blocks * - iscsilun->block_size / BDRV_SECTOR_SIZE ; + bs->total_sectors = sector_lun2qemu(iscsilun->num_blocks, iscsilun); /* Medium changer or tape. We dont have any emulation for this so this must * be sg ioctl compatible. We force it to be sg, otherwise qemu will try -- 1.7.9.5