From nobody Sun Apr 28 21:45:36 2024 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; 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 1501766921237835.6827132544739; Thu, 3 Aug 2017 06:28:41 -0700 (PDT) Received: from localhost ([::1]:42708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddGB5-0007K3-Qe for importer@patchew.org; Thu, 03 Aug 2017 09:28:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddG9e-0006L3-EO for qemu-devel@nongnu.org; Thu, 03 Aug 2017 09:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddG9a-0007CK-KS for qemu-devel@nongnu.org; Thu, 03 Aug 2017 09:27:10 -0400 Received: from mx2.suse.de ([195.135.220.15]:47245 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddG9a-00075H-Ca for qemu-devel@nongnu.org; Thu, 03 Aug 2017 09:27:06 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 97580AF15; Thu, 3 Aug 2017 13:27:03 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Hannes Reinecke To: Paolo Bonzini Date: Thu, 3 Aug 2017 15:27:00 +0200 Message-Id: <1501766821-76419-2-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1501766821-76419-1-git-send-email-hare@suse.de> References: <1501766821-76419-1-git-send-email-hare@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 Subject: [Qemu-devel] [PATCH 1/2] scsi: Make LUN 0 a simple enclosure 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: Hannes Reinecke , qemu-devel@nongnu.org, Hannes Reinecke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of having an 'invisible' LUN0 (in case LUN 0 is not connected) this patch maks LUN0 a enclosure service, exposing it to the OS. Signed-off-by: Hannes Reinecke --- hw/scsi/scsi-bus.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 23c51de..c89e82d 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -493,10 +493,11 @@ static bool scsi_target_emulate_inquiry(SCSITargetReq= *r) if (r->req.lun !=3D 0) { r->buf[0] =3D TYPE_NO_LUN; } else { - r->buf[0] =3D TYPE_NOT_PRESENT | TYPE_INACTIVE; + r->buf[0] =3D TYPE_ENCLOSURE; r->buf[2] =3D 5; /* Version */ r->buf[3] =3D 2 | 0x10; /* HiSup, response data format */ r->buf[4] =3D r->len - 5; /* Additional Length =3D (Len - 1) - 4 */ + r->buf[6] =3D 0x40; /* Enclosure service */ r->buf[7] =3D 0x10 | (r->req.bus->info->tcq ? 0x02 : 0); /* Sync, = TCQ. */ memcpy(&r->buf[8], "QEMU ", 8); memcpy(&r->buf[16], "QEMU TARGET ", 16); @@ -505,6 +506,54 @@ static bool scsi_target_emulate_inquiry(SCSITargetReq = *r) return true; } =20 +static bool scsi_target_emulate_receive_diagnostic(SCSITargetReq *r) +{ + uint8_t page_code =3D r->req.cmd.buf[2]; + unsigned char *enc_desc, *type_desc; + + assert(r->req.dev->lun !=3D r->req.lun); + + scsi_target_alloc_buf(&r->req, 0x38); + + switch (page_code) { + case 0x00: + r->buf[r->len++] =3D page_code ; /* this page */ + r->buf[r->len++] =3D 0x00; + r->buf[r->len++] =3D 0x00; + r->buf[r->len++] =3D 0x03; + r->buf[r->len++] =3D 0x00; + r->buf[r->len++] =3D 0x01; + r->buf[r->len++] =3D 0x08; + break; + case 0x01: + memset(r->buf, 0, 0x38); + r->buf[0] =3D page_code; + r->buf[3] =3D 0x30; + enc_desc =3D &r->buf[8]; + enc_desc[0] =3D 0x09; + enc_desc[2] =3D 1; + enc_desc[3] =3D 0x24; + memcpy(&enc_desc[12], "QEMU ", 8); + memcpy(&enc_desc[20], "QEMU TARGET ", 16); + pstrcpy((char *)&enc_desc[36], 4, qemu_hw_version()); + type_desc =3D &r->buf[48]; + type_desc[1] =3D 1; + r->len =3D 0x38; + break; + case 0x08: + r->buf[0] =3D page_code; + r->buf[1] =3D 0x00; + r->buf[2] =3D 0x00; + r->buf[3] =3D 0x00; + r->len =3D 4; + break; + default: + return false; + } + r->len =3D MIN(r->req.cmd.xfer, r->len); + return true; +} + static size_t scsi_sense_len(SCSIRequest *req) { if (req->dev->type =3D=3D TYPE_SCANNER) @@ -528,6 +577,11 @@ static int32_t scsi_target_send_command(SCSIRequest *r= eq, uint8_t *buf) goto illegal_request; } break; + case RECEIVE_DIAGNOSTIC: + if (!scsi_target_emulate_receive_diagnostic(r)) { + goto illegal_request; + } + break; case REQUEST_SENSE: scsi_target_alloc_buf(&r->req, scsi_sense_len(req)); r->len =3D scsi_device_get_sense(r->req.dev, r->buf, --=20 1.8.5.6 From nobody Sun Apr 28 21:45:36 2024 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; 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 1501766920937352.8201346796586; Thu, 3 Aug 2017 06:28:40 -0700 (PDT) Received: from localhost ([::1]:42709 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddGB5-0007KN-If for importer@patchew.org; Thu, 03 Aug 2017 09:28:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddG9e-0006Kz-Dd for qemu-devel@nongnu.org; Thu, 03 Aug 2017 09:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddG9a-0007CT-LJ for qemu-devel@nongnu.org; Thu, 03 Aug 2017 09:27:10 -0400 Received: from mx2.suse.de ([195.135.220.15]:47249 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddG9a-00075N-Ch for qemu-devel@nongnu.org; Thu, 03 Aug 2017 09:27:06 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id A0884AF11; Thu, 3 Aug 2017 13:27:03 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Hannes Reinecke To: Paolo Bonzini Date: Thu, 3 Aug 2017 15:27:01 +0200 Message-Id: <1501766821-76419-3-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1501766821-76419-1-git-send-email-hare@suse.de> References: <1501766821-76419-1-git-send-email-hare@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 Subject: [Qemu-devel] [PATCH 2/2] scsi: use qemu_uuid to generate logical identifier for SES 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: Hannes Reinecke , qemu-devel@nongnu.org, Hannes Reinecke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The SES enclosure descriptor requires a logical identifier, so generate one using the qemu_uuid and the Qumranet OUI. Signed-off-by: Hannes Reinecke --- hw/scsi/scsi-bus.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index c89e82d..8419c75 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -10,6 +10,7 @@ #include "trace.h" #include "sysemu/dma.h" #include "qemu/cutils.h" +#include "qemu/crc32c.h" =20 static char *scsibus_get_dev_path(DeviceState *dev); static char *scsibus_get_fw_dev_path(DeviceState *dev); @@ -533,6 +534,22 @@ static bool scsi_target_emulate_receive_diagnostic(SCS= ITargetReq *r) enc_desc[0] =3D 0x09; enc_desc[2] =3D 1; enc_desc[3] =3D 0x24; + if (qemu_uuid_set) { + uint32_t crc; + + /* + * Make this a NAA IEEE Registered identifier + * using Qumranet OUI (0x001A4A) and the + * crc32 from the system UUID. + */ + enc_desc[4] =3D 0x50; + enc_desc[5] =3D 0x01; + enc_desc[6] =3D 0xa4; + enc_desc[7] =3D 0xa0; + crc =3D crc32c(0xffffffff, qemu_uuid.data, 16); + cpu_to_le32s(&crc); + memcpy(&enc_desc[8], &crc, 4); + } memcpy(&enc_desc[12], "QEMU ", 8); memcpy(&enc_desc[20], "QEMU TARGET ", 16); pstrcpy((char *)&enc_desc[36], 4, qemu_hw_version()); --=20 1.8.5.6