From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzTLM-00049J-8y for qemu-devel@nongnu.org; Wed, 17 Jul 2013 11:08:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UzTLK-0000tQ-UH for qemu-devel@nongnu.org; Wed, 17 Jul 2013 11:08:40 -0400 Received: from mail-ea0-x235.google.com ([2a00:1450:4013:c01::235]:47363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzTIU-0000Hk-Ck for qemu-devel@nongnu.org; Wed, 17 Jul 2013 11:05:42 -0400 Received: by mail-ea0-f181.google.com with SMTP id a15so1127568eae.26 for ; Wed, 17 Jul 2013 08:05:41 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 17 Jul 2013 17:05:24 +0200 Message-Id: <1374073524-8469-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1374073524-8469-1-git-send-email-pbonzini@redhat.com> References: <1374073524-8469-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 5/5] iscsi: factor out sector conversions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Lieven From: Peter Lieven Reviewed-by: Kevin Wolf Signed-off-by: Peter Lieven Signed-off-by: Paolo Bonzini --- block/iscsi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 1294fdf..5f28c6a 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -232,6 +232,11 @@ iscsi_aio_write16_cb(struct iscsi_context *iscsi, int status, iscsi_schedule_bh(acb); } +static int64_t sector_lun2qemu(int64_t sector, IscsiLun *iscsilun) +{ + return sector * iscsilun->block_size / BDRV_SECTOR_SIZE; +} + static int64_t sector_qemu2lun(int64_t sector, IscsiLun *iscsilun) { return sector * BDRV_SECTOR_SIZE / iscsilun->block_size; @@ -296,7 +301,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; @@ -1161,8 +1166,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.8.1.4