From nobody Tue Feb 10 01:00:07 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=1615028714; cv=none; d=zohomail.com; s=zohoarc; b=EW1jjDYrwrzrALHvAJ/+tdjF8IeZiBVNGXz03I4DIZyGPU3keTzs4Vb8kkIEqp9zz5DKfQp8141xzasZtW951GZPJXvmYU5HjlBtr9+YfqdyZe6W8AY7Q5VpyNtbZ/0E0eyJCQiFv07AsKw2BrWVl9EOWH+bbO1cgwJsdJKWkZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615028714; 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=q5f9t5j4/QGWJNhsSofDm2TZVW3Y7Podv7uACdRkSTU=; b=WHK0FV3EKm8PQQsAf2VmtBdeKoXiCARL4SRnKbK0spSXCRsxhbRIIAGas/lOQbVI3TK3Ve2YRLKG2NePUZeT8Hdj8ni7sXjq71ABt07rR4a5wAlAbMeqZeSrpqe//u6lkbczwuvWCEQax1O0Cfq2vxzDH7LMaXBvuMRhwgZdHxk= 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 161502871428175.06943163152926; Sat, 6 Mar 2021 03:05:14 -0800 (PST) Received: from localhost ([::1]:44474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIUkD-0004eF-7j for importer@patchew.org; Sat, 06 Mar 2021 06:05:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIUZu-0005yQ-O6 for qemu-devel@nongnu.org; Sat, 06 Mar 2021 05:54:35 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:46579) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIUZt-00089m-AB for qemu-devel@nongnu.org; Sat, 06 Mar 2021 05:54:34 -0500 Received: by mail-wr1-x42b.google.com with SMTP id a18so5171372wrc.13 for ; Sat, 06 Mar 2021 02:54:32 -0800 (PST) Received: from avogadro.redhat.com ([93.56.170.5]) by smtp.gmail.com with ESMTPSA id i26sm9326472wmb.18.2021.03.06.02.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 02:54:31 -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=q5f9t5j4/QGWJNhsSofDm2TZVW3Y7Podv7uACdRkSTU=; b=BK4TQz11Mg1++WmQy33q2mnHIIkjTB+7Xl5M26O7WNZXLcoY8ZApFWrBUju2p/mcN1 KPG9lylNE1/KxuwSXgp+Nqjuwum17JiEPXEMP+qMJDbtWdZKQL2tUQZbuPvA7OZRE+q+ UZpZUmi9dK7QlthP7Mm2YNR0/vqYeTpfDECcitDFfgM2Jzc4Zvf9DRTksK8wySup8a3m TmQppluYM5/gNx5JkPLBgYey2Zolvu91O4mvJKUvFt3ZUZEAWSv2myjkUm9zNOo0Q6BN f80R7ntM2TabEZFeA29h2qNnGWZKoFrAPwL/lWeKJuhGsZ1uQJO+LwvWSOgy+n0VcOvd opGA== 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=q5f9t5j4/QGWJNhsSofDm2TZVW3Y7Podv7uACdRkSTU=; b=CEl8qba4TZTlqJfqqz82khVw+uMANjUSfehAClBrE0/37u0++ajayyhmmpXZP/3tco M324H6G7HGLvq5PeAjalvWjdyXxUKj3COWiBKcbZQvusOgyxYEp0j+f6Muc4XxjmS6oW aVjm9OcBpUqk09y6mubdFXNx7vSBOMsnnEpPUX3Td+/eDjgm5y/FXczbU70Jh07Zg7Wb MHYPn/T59fUB6hLTVJo4YKPvB/qN0cofs40Iynt7TwLN9WvNWwFoXuCdQ2J/d7nalmxy FTx/7nba+FmMjQE8XRSh8XiITje2+I5ctoOSOAtc7aiL/Rsa7mlVDvvWnkc6OW180r9c mTeA== X-Gm-Message-State: AOAM530VFNSn3ynyqeXdely122h2Zaa5nEO8Y9xrAPVW7jO74tWF5CIc GSEPe0zaBh33z1U5V2u4b4RkFaiNKzU= X-Google-Smtp-Source: ABdhPJw0YSpC3L5gcc9Dk2szO6JdMAZOs7O8TwBpWGl01jOL0QJnhvZYbBqnnUiMuCIVSxnCM2zakg== X-Received: by 2002:adf:e5cf:: with SMTP id a15mr13309107wrn.226.1615028072076; Sat, 06 Mar 2021 02:54:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/23] scsi: Rename linux-specific SG_ERR codes to generic SCSI_HOST error codes Date: Sat, 6 Mar 2021 11:54:09 +0100 Message-Id: <20210306105419.110503-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210306105419.110503-1-pbonzini@redhat.com> References: <20210306105419.110503-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::42b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42b.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.249, 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: Hannes Reinecke 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" From: Hannes Reinecke We really should make a distinction between legitimate sense codes (ie if one is running against an emulated block device or for pass-through sense codes), and the intermediate errors generated during processing of the command, which really are not sense codes but refer to some specific internal status. And this internal state is not necessarily linux-specific, but rather can refer to the qemu implementation itself. So rename the linux-only SG_ERR codes to SCSI_HOST codes and make them available generally. Signed-off-by: Hannes Reinecke Message-Id: <20201116184041.60465-5-hare@suse.de> Signed-off-by: Paolo Bonzini --- include/scsi/utils.h | 23 ++++++++++++++++------- scsi/utils.c | 6 +++--- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/include/scsi/utils.h b/include/scsi/utils.h index ff7c7091b6..ddb22b56df 100644 --- a/include/scsi/utils.h +++ b/include/scsi/utils.h @@ -16,6 +16,22 @@ enum SCSIXferMode { SCSI_XFER_TO_DEV, /* WRITE, MODE_SELECT, ... */ }; =20 +enum SCSIHostStatus { + SCSI_HOST_OK, + SCSI_HOST_NO_LUN, + SCSI_HOST_BUSY, + SCSI_HOST_TIME_OUT, + SCSI_HOST_BAD_RESPONSE, + SCSI_HOST_ABORTED, + SCSI_HOST_ERROR =3D 0x07, + SCSI_HOST_RESET =3D 0x08, + SCSI_HOST_TRANSPORT_DISRUPTED =3D 0xe, + SCSI_HOST_TARGET_FAILURE =3D 0x10, + SCSI_HOST_RESERVATION_ERROR =3D 0x11, + SCSI_HOST_ALLOCATION_FAILURE =3D 0x12, + SCSI_HOST_MEDIUM_ERROR =3D 0x13, +}; + typedef struct SCSICommand { uint8_t buf[SCSI_CMD_BUF_SIZE]; int len; @@ -124,13 +140,6 @@ int scsi_cdb_length(uint8_t *buf); #define SG_ERR_DRIVER_TIMEOUT 0x06 #define SG_ERR_DRIVER_SENSE 0x08 =20 -#define SG_ERR_DID_OK 0x00 -#define SG_ERR_DID_NO_CONNECT 0x01 -#define SG_ERR_DID_BUS_BUSY 0x02 -#define SG_ERR_DID_TIME_OUT 0x03 - -#define SG_ERR_DRIVER_SENSE 0x08 - int sg_io_sense_from_errno(int errno_value, struct sg_io_hdr *io_hdr, SCSISense *sense); #endif diff --git a/scsi/utils.c b/scsi/utils.c index 6b56e01002..4d994b6d56 100644 --- a/scsi/utils.c +++ b/scsi/utils.c @@ -612,9 +612,9 @@ int sg_io_sense_from_errno(int errno_value, struct sg_i= o_hdr *io_hdr, if (errno_value !=3D 0) { return scsi_sense_from_errno(errno_value, sense); } else { - if (io_hdr->host_status =3D=3D SG_ERR_DID_NO_CONNECT || - io_hdr->host_status =3D=3D SG_ERR_DID_BUS_BUSY || - io_hdr->host_status =3D=3D SG_ERR_DID_TIME_OUT || + if (io_hdr->host_status =3D=3D SCSI_HOST_NO_LUN || + io_hdr->host_status =3D=3D SCSI_HOST_BUSY || + io_hdr->host_status =3D=3D SCSI_HOST_TIME_OUT || (io_hdr->driver_status & SG_ERR_DRIVER_TIMEOUT)) { return BUSY; } else if (io_hdr->host_status) { --=20 2.29.2