From patchwork Sat May 26 04:56:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ronnie sahlberg X-Patchwork-Id: 161448 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 408E2B6F13 for ; Sat, 26 May 2012 15:10:35 +1000 (EST) Received: from localhost ([::1]:51896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY9Gq-0003an-VH for incoming@patchwork.ozlabs.org; Sat, 26 May 2012 01:10:32 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=/rDi6YQ+z3s2/UUlSwp3mcaV3HroSUyULFXcOrATP1A=; b=J+t7OJN3Avm0AU1lm0NWQF2xQjh9CuW9lMy5+sWXt3sZQSrpVQjWVzWRdnKWtSrU3o t3gsObc9fQ60lCSTHj+d+j0FI3Xa9zvaF6ylZ9AHWW7IGjrbheutDfp9mVMimbPHh3oV k9le+fX4q0UMqqimy7Bo1KnZwklf+Y2F7VZtx79ySfTPsOTvnOMlTpIYPs5iDwU7KwZj NGwV4tIF64mCTecbCQPaNgGBZuNC4/HqPwIYm0S0nFAmPflCtVg1Uehv+8S6ClOzz9s0 xqfoche0QEJK8fAZqE5QVIZwE0Fuu5Y5icYNxWqsSZxW7PLCXZFVjpOM6ksxpCCgr4TI RZXQ== Received: by 10.68.226.193 with SMTP id ru1mr4134462pbc.79.1338009012920; Fri, 25 May 2012 22:10:12 -0700 (PDT) Received: from ronniesahlberg@gmail.com (CPE-138-130-106-226.lns3.cht.bigpond.net.au. [138.130.106.226]) by mx.google.com with ESMTPS id og6sm11360820pbb.42.2012.05.25.22.10.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 May 2012 22:10:12 -0700 (PDT) Received: by ronniesahlberg@gmail.com (sSMTP sendmail emulation); Sat, 26 May 2012 14:57:13 +1000 From: Ronnie Sahlberg To: pbonzini@redhat.com, qemu-devel@nongnu.org Date: Sat, 26 May 2012 14:56:40 +1000 Message-Id: <1338008201-29078-4-git-send-email-ronniesahlberg@gmail.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1338008201-29078-1-git-send-email-ronniesahlberg@gmail.com> References: <1338008201-29078-1-git-send-email-ronniesahlberg@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Ronnie Sahlberg Subject: [Qemu-devel] [PATCH 3/4] ISCSI: Only use READ16 for SBC devices. Use READ10 for other device types such as MMC X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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,