From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY9GZ-0003Or-OW for qemu-devel@nongnu.org; Sat, 26 May 2012 01:10:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SY9GX-0007qG-V5 for qemu-devel@nongnu.org; Sat, 26 May 2012 01:10:15 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:58578) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY9GX-0007Zv-Me for qemu-devel@nongnu.org; Sat, 26 May 2012 01:10:13 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so2858225pbb.4 for ; Fri, 25 May 2012 22:10:12 -0700 (PDT) From: Ronnie Sahlberg Date: Sat, 26 May 2012 14:56:40 +1000 Message-Id: <1338008201-29078-4-git-send-email-ronniesahlberg@gmail.com> In-Reply-To: <1338008201-29078-1-git-send-email-ronniesahlberg@gmail.com> References: <1338008201-29078-1-git-send-email-ronniesahlberg@gmail.com> Subject: [Qemu-devel] [PATCH 3/4] ISCSI: Only use READ16 for SBC devices. Use READ10 for other device types such as MMC List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: pbonzini@redhat.com, qemu-devel@nongnu.org Cc: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg --- block/iscsi.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 2ddb9e5..a015a52 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -379,14 +379,25 @@ iscsi_aio_readv(BlockDriverState *bs, int64_t sector_num, memset(acb->task, 0, sizeof(struct scsi_task)); acb->task->xfer_dir = SCSI_XFER_READ; - acb->task->cdb_size = 16; - acb->task->cdb[0] = 0x88; lba = sector_qemu2lun(sector_num, iscsilun); - *(uint32_t *)&acb->task->cdb[2] = htonl(lba >> 32); - *(uint32_t *)&acb->task->cdb[6] = htonl(lba & 0xffffffff); - *(uint32_t *)&acb->task->cdb[10] = htonl(num_sectors); acb->task->expxferlen = qemu_read_size; + switch (iscsilun->type) { + case TYPE_DISK: + acb->task->cdb_size = 16; + acb->task->cdb[0] = 0x88; + *(uint32_t *)&acb->task->cdb[2] = htonl(lba >> 32); + *(uint32_t *)&acb->task->cdb[6] = htonl(lba & 0xffffffff); + *(uint32_t *)&acb->task->cdb[10] = htonl(num_sectors); + break; + default: + acb->task->cdb_size = 10; + acb->task->cdb[0] = 0x28; + *(uint32_t *)&acb->task->cdb[2] = htonl(lba); + *(uint16_t *)&acb->task->cdb[7] = htons(num_sectors); + break; + } + if (iscsi_scsi_command_async(iscsi, iscsilun->lun, acb->task, iscsi_aio_read16_cb, NULL, -- 1.7.3.1