From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY9GF-0002QR-8T for qemu-devel@nongnu.org; Sat, 26 May 2012 01:09:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SY9GD-0007cU-CD for qemu-devel@nongnu.org; Sat, 26 May 2012 01:09:54 -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 1SY9GD-0007Zv-38 for qemu-devel@nongnu.org; Sat, 26 May 2012 01:09:53 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so2858225pbb.4 for ; Fri, 25 May 2012 22:09:52 -0700 (PDT) From: Ronnie Sahlberg Date: Sat, 26 May 2012 14:56:38 +1000 Message-Id: <1338008201-29078-2-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 1/4] ISCSI: Only call READCAPACITY16 for SBC devices 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 | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index df0b6c8..39d75cb 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -727,13 +727,20 @@ iscsi_inquiry_cb(struct iscsi_context *iscsi, int status, void *command_data, scsi_free_scsi_task(task); - task = iscsi_readcapacity16_task(iscsi, itask->iscsilun->lun, + switch (itask->iscsilun->type) { + case TYPE_DISK: + task = iscsi_readcapacity16_task(iscsi, itask->iscsilun->lun, iscsi_readcapacity16_cb, opaque); - if (task == NULL) { - error_report("iSCSI: failed to send readcapacity16 command."); - itask->status = 1; + if (task == NULL) { + error_report("iSCSI: failed to send readcapacity16 command."); + itask->status = 1; + itask->complete = 1; + return; + } + break; + default: + itask->status = 0; itask->complete = 1; - return; } } -- 1.7.3.1