From nobody Sat Feb 7 06:55:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505824649917602.977971379766; Tue, 19 Sep 2017 05:37:29 -0700 (PDT) Received: from localhost ([::1]:42595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duHmJ-0001Nv-MA for importer@patchew.org; Tue, 19 Sep 2017 08:37:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duHf4-0003ly-UC for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duHf2-0005F8-Ke for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:29:58 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:37388) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1duHf2-0005Ev-Ee for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:29:56 -0400 Received: by mail-wm0-x244.google.com with SMTP id f4so3731700wmh.4 for ; Tue, 19 Sep 2017 05:29:56 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id k18sm1292878wmd.22.2017.09.19.05.29.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 05:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zaNDpTtpo0spVzOtDxwsx7c9Ve0V8UYw1CrT+HqJNMw=; b=IqkgD195J9en4BxuBT4JixBfIPxvvPyT67PDPU5jOAFcx+jYGgWXyJ/pwNAwIgkVmS QdxxPO7m4sRsJG+3V2T5IEarbYvWi2WXSCoXrz/bKCux8+kodwZmTNwSJRoZZMl95paQ UciWaQXXQ7uNbJRxRSIwlFkKEntzOWs4YpIeMWtv0ReRZUv/4+Q06jm3Ho6HYOmAz+Z9 DLco3tEFY6269W+bsa1zIjdQBHk6iM91b+2T5LtDekMk3AqxeL0DMtHq4ssgm56Zosgd hBcBdFATaPTSE+6XqHM1KROfkxfXAxHyot5FKQ2mgCMNJ+xZe0Ydw5eXZ3/j7UuohATH B5RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=zaNDpTtpo0spVzOtDxwsx7c9Ve0V8UYw1CrT+HqJNMw=; b=c0R7RSfATX5i0+RDFKJSCSuKhSeGzUix4OdbX7flrIYC5TFMCYfc+OlwxbaQYcVPtD cHbG1PxOXAvFiiHSe50gUQ2+tAj5IywN2jKzWvfqzX7O8YzQiwdTBIBqvnGNToYmWSkm fIH+zNPZNFMEjF/kTlZLgUij+IpA22UDqa94ErzqXxPC5/C9vhh+2jQbfEFWUcv7Kyu8 F135NDOgC5YV61fZxxd4pNg2dpNd5CyOEru2VxlITOCZKEk9NioL2Ji0Zev1Pdk6RnY3 DZ+cf+6RTyyuuNhMWj1ETkGhDr5u3xfBWepeN00i8ysTcFnuij99xzYuHA87go8qG30d DdjQ== X-Gm-Message-State: AHPjjUjvYSPxSW2Egr4ZTgCpn9razEXEJkZI+bOeW8XSVeG7+ltpWKtT 49TgWWWDERScgc73DiSlgSmWZxR2 X-Google-Smtp-Source: AOwi7QBE5BxAEpztb4CfiD87k3vKXbr7iD1NBhPFSAlUvx4wi6yF05yBoUu6ZLhF3/uSdLSGHYdaQg== X-Received: by 10.28.92.73 with SMTP id q70mr990753wmb.150.1505824195118; Tue, 19 Sep 2017 05:29:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 14:29:00 +0200 Message-Id: <1505824179-21541-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505824179-21541-1-git-send-email-pbonzini@redhat.com> References: <1505824179-21541-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 11/50] scsi-block: Support rerror/werror X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Fam Zheng This makes the werror/rerror options available on the scsi-block device, to allow user specify error handling policy similar to scsi-hd. Signed-off-by: Fam Zheng Message-Id: <20170821141008.19383-5-famz@redhat.com> Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 5f1e5e8..cf38f93 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -39,6 +39,7 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while = (0) #include "hw/block/block.h" #include "sysemu/dma.h" #include "qemu/cutils.h" +#include "scsi/scsi.h" =20 #ifdef __linux #include @@ -106,7 +107,7 @@ typedef struct SCSIDiskState bool tray_locked; } SCSIDiskState; =20 -static int scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_faile= d); +static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_fail= ed); =20 static void scsi_free_request(SCSIRequest *req) { @@ -184,19 +185,10 @@ static bool scsi_disk_req_check_error(SCSIDiskReq *r,= int ret, bool acct_failed) return true; } =20 - if (ret < 0) { + if (ret < 0 || (r->status && *r->status)) { return scsi_handle_rw_error(r, -ret, acct_failed); } =20 - if (r->status && *r->status) { - if (acct_failed) { - SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev= ); - block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct); - } - scsi_req_complete(&r->req, *r->status); - return true; - } - return false; } =20 @@ -422,13 +414,13 @@ static void scsi_read_data(SCSIRequest *req) } =20 /* - * scsi_handle_rw_error has two return values. 0 means that the error - * must be ignored, 1 means that the error has been processed and the + * scsi_handle_rw_error has two return values. False means that the error + * must be ignored, true means that the error has been processed and the * caller should not do anything else for this request. Note that * scsi_handle_rw_error always manages its reference counts, independent * of the return value. */ -static int scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_faile= d) +static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_fail= ed) { bool is_read =3D (r->req.cmd.mode =3D=3D SCSI_XFER_FROM_DEV); SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); @@ -440,6 +432,11 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int er= ror, bool acct_failed) block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct); } switch (error) { + case 0: + /* The command has run, no need to fake sense. */ + assert(r->status && *r->status); + scsi_req_complete(&r->req, *r->status); + break; case ENOMEDIUM: scsi_check_condition(r, SENSE_CODE(NO_MEDIUM)); break; @@ -457,6 +454,18 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int er= ror, bool acct_failed) break; } } + if (!error) { + assert(r->status && *r->status); + error =3D scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.sens= e)); + + if (error =3D=3D ECANCELED || error =3D=3D EAGAIN || error =3D=3D = ENOTCONN || + error =3D=3D 0) { + /* These errors are handled by guest. */ + scsi_req_complete(&r->req, *r->status); + return true; + } + } + blk_error_action(s->qdev.conf.blk, action, is_read, error); if (action =3D=3D BLOCK_ERROR_ACTION_STOP) { scsi_req_retry(&r->req); @@ -2972,6 +2981,7 @@ static const TypeInfo scsi_cd_info =3D { =20 #ifdef __linux__ static Property scsi_block_properties[] =3D { + DEFINE_BLOCK_ERROR_PROPERTIES(SCSIDiskState, qdev.conf), \ DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.blk), DEFINE_PROP_END_OF_LIST(), }; --=20 1.8.3.1