From nobody Tue Feb 10 14:42:29 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=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1655896306566633.4338438524759; Wed, 22 Jun 2022 04:11:46 -0700 (PDT) Received: from localhost ([::1]:53280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3yGu-0000Oq-VK for importer@patchew.org; Wed, 22 Jun 2022 07:11:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3y03-0005Pe-VH; Wed, 22 Jun 2022 06:54:19 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:37916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3y01-0005VI-B8; Wed, 22 Jun 2022 06:54:19 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o3xyp-000CTX-Lm; Wed, 22 Jun 2022 11:53:04 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=McmL4ezjk5q8bNEj7Y+7OTinT8/N2LxnDXtwxpHnSWc=; b=dO5qaekcoG1Nxk6fE9DHoPEt3h fmw/8ScSxWRnSXIMs/umOPFqJY51uiSWHoHbCYE/cGQiLcCbiX8T2IqNQKQ5rGJ5lYvUfgBMOzq+Y VbIK9LNAer6sOchKcvZwqK5pltsprPho0bgF3aHDxl39UPq7L6bVnUD8BQTl8gLcnOG17Q9HAP6a2 w/64qZSyfBaQSUIRiglUrIdJpSYydU1iiiD8Q/B2lvVJqpGhJ9ryRo2wiKfg7iWaje1VeMD4L9Lbk kwVmHucUw7+RXmt2C3QvAmbSKrZW9oQHip50kPxxnp5WACRExaic2W8LLpgcSPBL1Z3xZKSopJWi9 tokeMe6BQNQuX2e9oFc1yuIskJ9OGe9jarzUzVf8M1dbiTVQc0NfhjMVlvMJGvg0QJ9Eh+Wk5it7X iRDDp0DP0ZxDDlB7Yqx2V4M0t0S2sC0Vp9fzqN5itZVDeYfAAg1WL8gRTY4qUJhYeSPNQhTRBxVhB qbLRBXitj3iqEnxwHzKxOvIdV03ipwdBJjvPAUZw9N/QY5lvAQVUHZ6CstrbbVzGpDkoVEqRTBsaY 6fCAXhIu5sCbjcnuQ0XxVTuuqmn4tWMgGCvpQbURn8tY4OSRT+tbZZ+CSDsAozcdnHweNiWjogRdB wgYKpZmWMYztaEIw90KTSNSw0XJX9xjXrvDEEqcTo=; From: Mark Cave-Ayland To: pbonzini@redhat.com, laurent@vivier.eu, fam@euphon.net, qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Wed, 22 Jun 2022 11:53:12 +0100 Message-Id: <20220622105314.802852-13-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220622105314.802852-1-mark.cave-ayland@ilande.co.uk> References: <20220622105314.802852-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 12/14] scsi-disk: allow MODE SELECT block descriptor to set the block size X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-ZM-MESSAGEID: 1655896307444100001 Content-Type: text/plain; charset="utf-8" The MODE SELECT command can contain an optional block descriptor that can b= e used to set the device block size. If the block descriptor is present then updat= e the block size on the SCSI device accordingly. This allows CDROMs to be used with A/UX which requires a CDROM drive which = is capable of switching from a 2048 byte sector size to a 512 byte sector size. Signed-off-by: Mark Cave-Ayland --- hw/scsi/scsi-disk.c | 6 ++++++ hw/scsi/trace-events | 1 + 2 files changed, 7 insertions(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 3659583e13..9c8bad0283 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1616,6 +1616,12 @@ static void scsi_disk_emulate_mode_select(SCSIDiskRe= q *r, uint8_t *inbuf) goto invalid_param; } =20 + /* Allow changing the block size */ + if (bd_len && p[6] !=3D (s->qdev.blocksize >> 8)) { + s->qdev.blocksize =3D p[6] << 8; + trace_scsi_disk_mode_select_set_blocksize(s->qdev.blocksize); + } + len -=3D bd_len; p +=3D bd_len; =20 diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events index 8e927ff62d..ab238293f0 100644 --- a/hw/scsi/trace-events +++ b/hw/scsi/trace-events @@ -340,6 +340,7 @@ scsi_disk_dma_command_WRITE(const char *cmd, uint64_t l= ba, int len) "Write %s(se scsi_disk_new_request(uint32_t lun, uint32_t tag, const char *line) "Comma= nd: lun=3D%d tag=3D0x%x data=3D%s" scsi_disk_aio_sgio_command(uint32_t tag, uint8_t cmd, uint64_t lba, int le= n, uint32_t timeout) "disk aio sgio: tag=3D0x%x cmd=3D0x%x (sector %" PRId6= 4 ", count %d) timeout=3D%u" scsi_disk_mode_select_page_truncated(int page, int len, int page_len) "pag= e %d expected length %d but received length %d" +scsi_disk_mode_select_set_blocksize(int blocksize) "set block size to %d" =20 # scsi-generic.c scsi_generic_command_complete_noio(void *req, uint32_t tag, int statuc) "C= ommand complete %p tag=3D0x%x status=3D%d" --=20 2.30.2