From nobody Tue Feb 10 06:27:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614191403; cv=none; d=zohomail.com; s=zohoarc; b=llnsbZRIiA3NNn4CQ3YBOELEFykSLpJpps6bN+NDLPsuJ4gttiJo9m1NnXfnXxBICgCdXOknMi4Lq8jcVFVoMhr0yjte7g3C3U7S5+J5OETvVusdmHC0Sq+1lGwykbFmozPsaS1SYrp8clxSxuhGkmh+PRJMNmJYquXSs4zUxfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614191403; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=osmTk+V+aeU1VByo64kXupbvRKx+EAC0OdfK2HOG+ik=; b=H4EkVUv+JeHoQchHdjJNyWizm3+nona7HCyoJEYUHsX09ZbtmJwqycRr+6+L2VpsdMpNagFJoOZwDiX2Xb4qgS1jl3mSQ41BxztbEJjjejcWLsRgb6fjVcytFPDNZBH/+xkBJVK0cvADWuJs57Mw46z+YvS5Okctf+p4fZ4SqvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161419140370860.15574004877192; Wed, 24 Feb 2021 10:30:03 -0800 (PST) Received: from localhost ([::1]:51934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEyvC-0007iU-KU for importer@patchew.org; Wed, 24 Feb 2021 13:30:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEyqK-0002Jv-Rb for qemu-devel@nongnu.org; Wed, 24 Feb 2021 13:25:01 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:38533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEyqJ-0004mO-84 for qemu-devel@nongnu.org; Wed, 24 Feb 2021 13:25:00 -0500 Received: by mail-ej1-x62d.google.com with SMTP id n20so4652956ejb.5 for ; Wed, 24 Feb 2021 10:24:58 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id bw22sm1791172ejb.78.2021.02.24.10.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 10:24:57 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=osmTk+V+aeU1VByo64kXupbvRKx+EAC0OdfK2HOG+ik=; b=qJttzzqFEluTgyv/dn0yBp6jSLpDd6q9aGzb6ljO3h7gQs0qqIggSRkzJ9/X9jHBSB rkAygw8Q6iYTaUpezaZ+iOClcmHS82mxiYUtTbTy10ZUD5pM+AXI7Iz7hjBQs4jHgHS4 HCVxRrZ/iy7/xdwWBgihsDiHCJ6g4s4/Js7q+7MEOJ0a1jC7lCV3T8w4bA8O8WmrUGOB pxS/fXdnZZ9ybITPOLRiAiQeINqbWn2Qk4P+EDEgxqFz4PZyQZ3JEtOq18xhIp1od2+j aD4+DW+19hPD9beCpsQtdkdJWwhgaleEc7yw04c/59iOnABFYf3RYloDz4fN7XQkmMwk Jh5w== 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:mime-version:content-transfer-encoding; bh=osmTk+V+aeU1VByo64kXupbvRKx+EAC0OdfK2HOG+ik=; b=mOckMgqMR+8g4QJSwci9Yb4WQJnGyeKaCXkNBaCxcd7D9fQTGXm8w4iG6j3G8oHEUM CHWCyEhFHixvfack/zC8jo1VAEcucorR1xatF+oKfDt9cOfrPUA8VLpNKD3FFDrYC2q0 /yeVCSBh6yAO16413G1XBJ1+KJlCOXBe6PZupl8cTlsJPVGfbRZbhWWZJU7CZDbNoumD Ib8aSwyE6U7/cVeuyvb/1CSsUT8YELb+UDB2J+4i4MaC/wSZeRdbKcAgmccKlq9KjUQA XpCryTuHcKZDbbbcTXlUgvU6/Lu35mU1sBQoO8VkF8OZceCkGAex/8Tj9+dq3MEZPjc5 1nCg== X-Gm-Message-State: AOAM533vJ9IxpKix8ZqDqpWmC8t8730+qTcfkT4AQ3PZMdtg35hrVdw1 ZUNloNe3rtuvxIPHK2udq2hBHaJyunw= X-Google-Smtp-Source: ABdhPJxQFarWTVJuU4flp5VNSfzwi0ZEmR9Kp7EGyTjAqbv0h0slc7F7KhaXQtDol7ZhNXI89vxLig== X-Received: by 2002:a17:906:3f96:: with SMTP id b22mr31923202ejj.478.1614191097340; Wed, 24 Feb 2021 10:24:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/10] scsi-disk: pass SCSI status to scsi_handle_rw_error Date: Wed, 24 Feb 2021 19:24:47 +0100 Message-Id: <20210224182453.587731-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210224182453.587731-1-pbonzini@redhat.com> References: <20210224182453.587731-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hare@suse.de Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Instead of fishing it from *r->status, just pass the SCSI status as a positive value of the second parameter and an errno as a negative value. Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 9c6099ffc4..548a5297fa 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -187,34 +187,48 @@ static void scsi_disk_load_request(QEMUFile *f, SCSIR= equest *req) * scsi_handle_rw_error always manages its reference counts, independent * of the return value. */ -static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_fail= ed) +static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed) { bool is_read =3D (r->req.cmd.mode =3D=3D SCSI_XFER_FROM_DEV); SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); SCSIDiskClass *sdc =3D (SCSIDiskClass *) object_get_class(OBJECT(s)); - BlockErrorAction action =3D blk_get_error_action(s->qdev.conf.blk, - is_read, error); - SCSISense sense; + SCSISense sense =3D SENSE_CODE(NO_SENSE); + int error =3D 0; + bool req_has_sense =3D false; + BlockErrorAction action; + int status; =20 + if (ret < 0) { + status =3D scsi_sense_from_errno(-ret, &sense); + error =3D -ret; + } else { + /* A passthrough command has completed with nonzero status. */ + status =3D ret; + if (status =3D=3D CHECK_CONDITION) { + req_has_sense =3D true; + error =3D scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.= sense)); + } else { + error =3D EINVAL; + } + } + + action =3D blk_get_error_action(s->qdev.conf.blk, is_read, error); if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { if (acct_failed) { block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct); } - if (error =3D=3D 0) { + if (req_has_sense) { /* A passthrough command has run and has produced sense data; = check * whether the error has to be handled by the guest or should = rather * pause the host. */ - assert(r->status && *r->status); if (scsi_sense_buf_is_guest_recoverable(r->req.sense, sizeof(r= ->req.sense))) { /* These errors are handled by guest. */ sdc->update_sense(&r->req); - scsi_req_complete(&r->req, *r->status); + scsi_req_complete(&r->req, status); return true; } - error =3D scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.= sense)); } else { - int status =3D scsi_sense_from_errno(error, &sense); if (status =3D=3D CHECK_CONDITION) { scsi_req_build_sense(&r->req, sense); } @@ -240,8 +254,10 @@ static bool scsi_disk_req_check_error(SCSIDiskReq *r, = int ret, bool acct_failed) return true; } =20 - if (ret < 0 || (r->status && *r->status)) { - return scsi_handle_rw_error(r, -ret, acct_failed); + if (ret < 0) { + return scsi_handle_rw_error(r, ret, acct_failed); + } else if (r->status && *r->status) { + return scsi_handle_rw_error(r, *r->status, acct_failed); } =20 return false; --=20 2.29.2