From patchwork Wed Apr 2 12:45:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 336337 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 204231400F7 for ; Wed, 2 Apr 2014 23:46:14 +1100 (EST) Received: from localhost ([::1]:38382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVKYU-0004qb-KA for incoming@patchwork.ozlabs.org; Wed, 02 Apr 2014 08:46:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVKY9-0004qV-8Q for qemu-devel@nongnu.org; Wed, 02 Apr 2014 08:45:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WVKY2-0003Jj-O4 for qemu-devel@nongnu.org; Wed, 02 Apr 2014 08:45:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVKY2-0003J4-0f for qemu-devel@nongnu.org; Wed, 02 Apr 2014 08:45:42 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s32CjYnR009169 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 2 Apr 2014 08:45:34 -0400 Received: from yakj.usersys.redhat.com (ovpn-112-40.ams2.redhat.com [10.36.112.40]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s32CjVQe001640; Wed, 2 Apr 2014 08:45:32 -0400 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 2 Apr 2014 14:45:28 +0200 Message-Id: <1396442728-32321-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pl@kamp.de Subject: [Qemu-devel] [PATCH for-2.0] iscsi: recognize "invalid field" ASCQ from WRITE SAME command 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 Some targets may return "invalid field" as the ASCQ from WRITE SAME if they support the command only without the UNMAP field. Recognize that, and return ENOTSUP just like for "invalid operation code". Signed-off-by: Paolo Bonzini Reviewed-by: Peter Lieven --- block/iscsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index 6d6cd4f..f01c883 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1012,7 +1012,8 @@ retry: if (iTask.status == SCSI_STATUS_CHECK_CONDITION && iTask.task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && - iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { + (iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE || + iTask.task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_FIELD_IN_CDB)) { /* WRITE SAME is not supported by the target */ iscsilun->has_write_same = false; scsi_free_scsi_task(iTask.task);