From nobody Sun Feb 8 21:06:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1769456977; cv=none; d=zohomail.com; s=zohoarc; b=ObYJkqNQsHr4/e4CU74NNZfvpu1AMWsXwaGAOlZaQWe1NMvALdPpOMUeTR/OY1RrkeERBt4ea5dg4QHhSWZysmDfvJAttcjk5sXTwLA3CgtIIeYAayfLBPOcsPdCWVdgT+vB/BuSWlBRIatCGXbuL5jI7gx+g1xq7mtd0rOHDlE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769456977; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TkILmiJQdkYLAtvznkxkJeL7qB7WKa4fKOqLfIQTCdU=; b=H/0GbPmAM8Jgg8qxzNP9R12VX7Cvl6V5ZpORAzsguFRxPly1wdtSt48Q3Hs6gWOLy5GPiqlxpln0eB8vUUBvbJ2uZoxIbv1ItnWy3mHMoEl75alkhlwR/oKEPWQwc4SAkcwWvHlTYJWmoqkuN4Efs79ly6NzXqiY0h1vgKckm1s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1769456977812752.0956223132965; Mon, 26 Jan 2026 11:49:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkSZN-0005fl-48; Mon, 26 Jan 2026 14:48:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vkSZ0-0005aH-8t for qemu-devel@nongnu.org; Mon, 26 Jan 2026 14:47:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vkSYy-0007LF-NQ for qemu-devel@nongnu.org; Mon, 26 Jan 2026 14:47:54 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-250-hcq-D4E0NF6B759ZDsK68Q-1; Mon, 26 Jan 2026 14:47:47 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3035818005B0; Mon, 26 Jan 2026 19:47:46 +0000 (UTC) Received: from localhost (unknown [10.2.17.0]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 56AC71800665; Mon, 26 Jan 2026 19:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769456872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TkILmiJQdkYLAtvznkxkJeL7qB7WKa4fKOqLfIQTCdU=; b=FAWI8i9ApqQnxl/PJtAu7ObFAIpcPx4patCOXZtN5V8UEf1ZJDWXBlYK+iQq0ichAfOhkm wDvtClNuqAyByrQrRPfaUoehe1lDkpR9RxXaupoZnBPmwcZN+Ui4ouPh+O+b8QVOMaPFkU 8m1CbrOchWBn8NDcXw0spqx4nOfvg/Q= X-MC-Unique: hcq-D4E0NF6B759ZDsK68Q-1 X-Mimecast-MFC-AGG-ID: hcq-D4E0NF6B759ZDsK68Q_1769456866 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: pkrempa@redhat.com, Paolo Bonzini , Alberto Faria , Hannes Reinecke , Zhao Liu , Kevin Wolf , qemu-block@nongnu.org, Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Qing Wang , Yanan Wang , Marcel Apfelbaum , Stefan Hajnoczi Subject: [PATCH v2 1/5] scsi: generalize scsi_SG_IO_FROM_DEV() to scsi_SG_IO() Date: Mon, 26 Jan 2026 14:47:31 -0500 Message-ID: <20260126194735.46167-2-stefanha@redhat.com> In-Reply-To: <20260126194735.46167-1-stefanha@redhat.com> References: <20260126194735.46167-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1769456979296154100 Content-Type: text/plain; charset="utf-8" Add a direction argument so that scsi_SG_IO() can be used for SG_DXFER_FROM_DEV and SG_DXFER_TO_DEV transfers. Signed-off-by: Stefan Hajnoczi --- include/hw/scsi/scsi.h | 4 ++-- hw/scsi/scsi-disk.c | 4 ++-- hw/scsi/scsi-generic.c | 18 ++++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index d26f1127bb..670c477e38 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -236,8 +236,8 @@ void scsi_device_report_change(SCSIDevice *dev, SCSISen= se sense); void scsi_device_unit_attention_reported(SCSIDevice *dev); void scsi_generic_read_device_inquiry(SCSIDevice *dev); int scsi_device_get_sense(SCSIDevice *dev, uint8_t *buf, int len, bool fix= ed); -int scsi_SG_IO_FROM_DEV(BlockBackend *blk, uint8_t *cmd, uint8_t cmd_size, - uint8_t *buf, uint8_t buf_size, uint32_t timeout); +int scsi_SG_IO(BlockBackend *blk, int direction, uint8_t *cmd, uint8_t cmd= _size, + uint8_t *buf, uint8_t buf_size, uint32_t timeout); SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int target, int lu= n); SCSIDevice *scsi_device_get(SCSIBus *bus, int channel, int target, int lun= ); =20 diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 0f896c27f4..97ae535a27 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2748,8 +2748,8 @@ static int get_device_type(SCSIDiskState *s) cmd[0] =3D INQUIRY; cmd[4] =3D sizeof(buf); =20 - ret =3D scsi_SG_IO_FROM_DEV(s->qdev.conf.blk, cmd, sizeof(cmd), - buf, sizeof(buf), s->qdev.io_timeout); + ret =3D scsi_SG_IO(s->qdev.conf.blk, SG_DXFER_FROM_DEV, cmd, sizeof(cm= d), + buf, sizeof(buf), s->qdev.io_timeout); if (ret < 0) { return -1; } diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 6acaf8831a..61511cf945 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -525,8 +525,9 @@ static int read_naa_id(const uint8_t *p, uint64_t *p_ww= n) return -EINVAL; } =20 -int scsi_SG_IO_FROM_DEV(BlockBackend *blk, uint8_t *cmd, uint8_t cmd_size, - uint8_t *buf, uint8_t buf_size, uint32_t timeout) +int scsi_SG_IO(BlockBackend *blk, int direction, uint8_t *cmd, + uint8_t cmd_size, uint8_t *buf, uint8_t buf_size, + uint32_t timeout) { sg_io_hdr_t io_header; uint8_t sensebuf[8]; @@ -534,7 +535,7 @@ int scsi_SG_IO_FROM_DEV(BlockBackend *blk, uint8_t *cmd= , uint8_t cmd_size, =20 memset(&io_header, 0, sizeof(io_header)); io_header.interface_id =3D 'S'; - io_header.dxfer_direction =3D SG_DXFER_FROM_DEV; + io_header.dxfer_direction =3D direction; io_header.dxfer_len =3D buf_size; io_header.dxferp =3D buf; io_header.cmdp =3D cmd; @@ -574,8 +575,8 @@ static void scsi_generic_set_vpd_bl_emulation(SCSIDevic= e *s) cmd[2] =3D 0x00; cmd[4] =3D sizeof(buf); =20 - ret =3D scsi_SG_IO_FROM_DEV(s->conf.blk, cmd, sizeof(cmd), - buf, sizeof(buf), s->io_timeout); + ret =3D scsi_SG_IO(s->conf.blk, SG_DXFER_FROM_DEV, cmd, sizeof(cmd), + buf, sizeof(buf), s->io_timeout); if (ret < 0) { /* * Do not assume anything if we can't retrieve the @@ -610,8 +611,8 @@ static void scsi_generic_read_device_identification(SCS= IDevice *s) cmd[2] =3D 0x83; cmd[4] =3D sizeof(buf); =20 - ret =3D scsi_SG_IO_FROM_DEV(s->conf.blk, cmd, sizeof(cmd), - buf, sizeof(buf), s->io_timeout); + ret =3D scsi_SG_IO(s->conf.blk, SG_DXFER_FROM_DEV, cmd, sizeof(cmd), + buf, sizeof(buf), s->io_timeout); if (ret < 0) { return; } @@ -662,7 +663,8 @@ static int get_stream_blocksize(BlockBackend *blk) cmd[0] =3D MODE_SENSE; cmd[4] =3D sizeof(buf); =20 - ret =3D scsi_SG_IO_FROM_DEV(blk, cmd, sizeof(cmd), buf, sizeof(buf), 6= ); + ret =3D scsi_SG_IO(blk, SG_DXFER_FROM_DEV, cmd, sizeof(cmd), + buf, sizeof(buf), 6); if (ret < 0) { return -1; } --=20 2.52.0