From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK6rn-0007c8-C2 for qemu-devel@nongnu.org; Fri, 15 Jan 2016 11:04:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aK6rm-0003Ik-HH for qemu-devel@nongnu.org; Fri, 15 Jan 2016 11:04:47 -0500 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:38607) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK6rm-0003IX-B6 for qemu-devel@nongnu.org; Fri, 15 Jan 2016 11:04:46 -0500 Received: by mail-wm0-x22e.google.com with SMTP id b14so31648114wmb.1 for ; Fri, 15 Jan 2016 08:04:46 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 15 Jan 2016 17:04:23 +0100 Message-Id: <1452873871-138914-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1452873871-138914-1-git-send-email-pbonzini@redhat.com> References: <1452873871-138914-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 07/15] iscsi: send readcapacity10 when readcapacity16 failed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Zhu Lingshan From: Zhu Lingshan When play with Dell MD3000 target, for sure it is a TYPE_DISK, but readcapacity16 would fail. Then we find that readcapacity10 succeeded. It looks like the target just support readcapacity10 even through it is a TYPE_DISK or have some TYPE_ROM characteristics. This patch can give a chance to send readcapacity16 when readcapacity10 failed. This patch is not harmful to original pathes Signed-off-by: Zhu Lingshan Message-Id: <1451359934-9236-1-git-send-email-lszhu@suse.com> [Don't fall through on UNIT ATTENTION. - Paolo] Signed-off-by: Paolo Bonzini --- block/iscsi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index eb28ddc..3acb052 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1243,8 +1243,13 @@ static void iscsi_readcapacity_sync(IscsiLun *iscsilun, Error **errp) iscsilun->lbprz = !!rc16->lbprz; iscsilun->use_16_for_rw = (rc16->returned_lba > 0xffffffff); } + break; } - break; + if (task != NULL && task->status == SCSI_STATUS_CHECK_CONDITION + && task->sense.key == SCSI_SENSE_UNIT_ATTENTION) { + break; + } + /* Fall through and try READ CAPACITY(10) instead. */ case TYPE_ROM: task = iscsi_readcapacity10_sync(iscsilun->iscsi, iscsilun->lun, 0, 0); if (task != NULL && task->status == SCSI_STATUS_GOOD) { -- 1.8.3.1