From nobody Sat Feb 7 06:55:22 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 1505825136907192.01650168628134; Tue, 19 Sep 2017 05:45:36 -0700 (PDT) Received: from localhost ([::1]:42630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duHuC-0008I0-6I for importer@patchew.org; Tue, 19 Sep 2017 08:45:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duHf7-0003oC-44 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duHf6-0005Gz-9c for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:01 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:37665) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1duHf6-0005Ga-3m for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:00 -0400 Received: by mail-wr0-x244.google.com with SMTP id u48so2145775wrf.4 for ; Tue, 19 Sep 2017 05:29:59 -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.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 05:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uIl0COuhSXoQslEjyWImp8/QxlB9YQ9nglFcpEX8yMA=; b=g20G7gFBeUe2WYI2hn/Tzr76+m2BwHkWy57AKOkwdGpP4uEp75kRYzV0xKtBx9y8Bm 5WNX9ZekV00eBt8X9ujlHEc6fa5tmFsBwMm55uT60J2YI0SkhLa9DW96S0tvhEGHpcle DX2KtPbVsai/xPG+krjuLHzcdxLrKhiyz2slSRZiEIDq9SG/hpWlvwhxeE0SrEJSeK/6 caY8iDOkVICM80Kz2YsktXyPSHm25vX0ZyUq7Qpuocm45ErrA9JTi/kQHBlqzIWRBBxX eTkT8lmRI10gprw/VEglTh/UMB97bwCIEEkirsMBs64kWuJdbxCjbAHTiN6WnsKhaf9N cWGA== 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:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uIl0COuhSXoQslEjyWImp8/QxlB9YQ9nglFcpEX8yMA=; b=c4RAecrbaJWgGxDaVS5s6Ztj7Fct9dcWo9u7PXRxzYXjA1XSqWa9HAtECpVOR5YFTK rOb28i+X7Og1tVRF0hjbwmUU6jHSGNjI6SbewDPORbHWaCdOi/Aia1c3fqx+HNRkrE5V LJO+lrbqCiCCFchMvGkxPbP86esky+9lVOHbXcCuxNtSxeKgNGws1d+HmfzbdzPYCuxZ Kmflh/UNtMSl5moiwcC6AOGhBfK0woNVezacwYyk3B12/90jnuXDSP2n559k89PUQg33 fAOe/K73RLi5kCS48BC5RC1HBa7OsiqeQnpiKlUwqjWYfY+R0ZQwibxy0uz2UfjBoNed y/CQ== X-Gm-Message-State: AHPjjUitYKWe89vf/VV5bRrvWn8yZ1GSESVVoiGjUDXf3pcg8NIPz0PX EXLs0k6kYwIej7se/KdFjMENGDn5 X-Google-Smtp-Source: AOwi7QDSpsODxMXmOpHXins0Jds3ayei5fPE4EXbRuIMoyiKxqgdWGFXghqp5WNO74Q0c7tQGHQK7A== X-Received: by 10.223.159.11 with SMTP id l11mr1307219wrf.148.1505824198795; Tue, 19 Sep 2017 05:29:58 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 14:29:03 +0200 Message-Id: <1505824179-21541-15-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> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 14/50] scsi: introduce scsi_build_sense 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: , 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 Move more knowledge of sense data format out of hw/scsi/scsi-bus.c for reusability. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-bus.c | 8 +------- include/scsi/utils.h | 2 ++ scsi/utils.c | 11 +++++++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 42920d5..652ab04 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -818,13 +818,7 @@ void scsi_req_build_sense(SCSIRequest *req, SCSISense = sense) { trace_scsi_req_build_sense(req->dev->id, req->lun, req->tag, sense.key, sense.asc, sense.ascq); - memset(req->sense, 0, 18); - req->sense[0] =3D 0x70; - req->sense[2] =3D sense.key; - req->sense[7] =3D 10; - req->sense[12] =3D sense.asc; - req->sense[13] =3D sense.ascq; - req->sense_len =3D 18; + req->sense_len =3D scsi_build_sense(req->sense, sense); } =20 static void scsi_req_enqueue_internal(SCSIRequest *req) diff --git a/include/scsi/utils.h b/include/scsi/utils.h index 90bf4dc..b49392d 100644 --- a/include/scsi/utils.h +++ b/include/scsi/utils.h @@ -30,6 +30,8 @@ typedef struct SCSISense { uint8_t ascq; } SCSISense; =20 +int scsi_build_sense(uint8_t *buf, SCSISense sense); + /* * Predefined sense codes */ diff --git a/scsi/utils.c b/scsi/utils.c index 2327e06..89d9167 100644 --- a/scsi/utils.c +++ b/scsi/utils.c @@ -96,6 +96,17 @@ int scsi_cdb_length(uint8_t *buf) return cdb_len; } =20 +int scsi_build_sense(uint8_t *buf, SCSISense sense) +{ + memset(buf, 0, 18); + buf[0] =3D 0x70; + buf[2] =3D sense.key; + buf[7] =3D 10; + buf[12] =3D sense.asc; + buf[13] =3D sense.ascq; + return 18; +} + /* * Predefined sense codes */ --=20 1.8.3.1