From nobody Mon Feb 9 14:38:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639658183; cv=none; d=zohomail.com; s=zohoarc; b=XrBU7/CL6QlDAXZYUZafVRwdRjb6it3eIwZW7e9PJcBJOXnG+y5bDmpwnvDMOx1fq01Z5ePgjT+nrO4wPuibSXPlTRPPEqeJypm8rpq+aj4N0LrxbjUPzWWUE+TyMY66FilL+WsLLexMsJnrSu2IPABs2gfYFpzWqUU5Y5uc+bQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639658183; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=8/M2Z91DmJISpf5VIdppwk0Jxgt7u3GlgWaSk5GaDk0=; b=kIaI/v192FD7lqUOhHtCTfiok+qUS/oyE29nB9359VWdgvn9nZohUosr7wCSaxmF6OhrR14sP9ut5bmnYtVRkAv+MLh+723Gnz9w2k2CLpluo026RYScjKc3MbMAUYXzB4AZ8a8LCAq5er1DE3WzftdWoTZP6E7BALZpgkjkRTM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1639658183150898.3350285269934; Thu, 16 Dec 2021 04:36:23 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-629-HT42BvNmN-aZik3jAinaqQ-1; Thu, 16 Dec 2021 07:36:19 -0500 Received: by mail-wm1-f70.google.com with SMTP id v62-20020a1cac41000000b0033719a1a714so13753401wme.6 for ; Thu, 16 Dec 2021 04:36:18 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id z11sm4817241wmf.9.2021.12.16.04.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 04:36:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639658182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8/M2Z91DmJISpf5VIdppwk0Jxgt7u3GlgWaSk5GaDk0=; b=PziryawweNfRDkjtRz1qOKH4T34hUnbSVUMH6wI/3gsIs8ZHDvPdVhukq3kdeJvYkbcDs5 KZPYtoT/Rwh7sIC9MD22DtrUTSCMNMSJz7khoKXcq1mfdq9z+BWQyEpHG4LZUQj20RcOef IDqPqNIuRnu9qLmaNu3FDUbe999+7Ps= X-MC-Unique: HT42BvNmN-aZik3jAinaqQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8/M2Z91DmJISpf5VIdppwk0Jxgt7u3GlgWaSk5GaDk0=; b=nhpIBUstHWmGyzbLFXVDyyc4bQBqW4rejIsMQT7ODajB5TZHl3kEyE+r36dpgNGFCy 5HVTrA8iu5NQrLzAQrQiPmB7Y1XiV+hElSsI4+qGVjbSJWl4hZwlYf4/SSXWk+PGrtEQ ++w3B55t/Y1zs6MXIYaJtlE4kCEH02V2Nnh2zEplWMoGfUGtrQ9qGzzRxWgJ7zJex9PP omvnmg/Ydduw7DUEEG3erfR8AgQrMZ+cuEevgoqIdld5dnWW/o9uqysZwC/cmJTmUVUz 4QsL6e5x7+8Aw/631gLLjwrgWVUJrr9MbCPby8gcbDzNIK7xfqN2KowtgMbJMmS1MaKa E7ow== X-Gm-Message-State: AOAM531m7/YXFpSv0Sr7T4fp7dE+yz2bjL+LAMMVRXLB9co0IkOv/elv fpU+yWJbJHFme4UzMs3+1lu2FpqHZvdVvyo1Qgdl2DqQTEwmNzK8Czk60ChvbaCnjgF6Kzyintt WJXfivfiBm5dNYQ== X-Received: by 2002:a1c:f609:: with SMTP id w9mr4791039wmc.99.1639658177944; Thu, 16 Dec 2021 04:36:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6fsYs6o2lFdMDoxOoeLq+MwLP7ixEHYKLskyotIS9oGEYCq9DI/d8Yv4UkdEbRF9k2ZJMZg== X-Received: by 2002:a1c:f609:: with SMTP id w9mr4791022wmc.99.1639658177775; Thu, 16 Dec 2021 04:36:17 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Bulekov , qemu-block@nongnu.org, Qiuhao Li , Hannes Reinecke , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Jason Wang , Li Qiang , Paolo Bonzini , David Hildenbrand , "Michael S. Tsirkin" , John Snow , Gerd Hoffmann , Marcel Apfelbaum , Keith Busch , Fam Zheng Subject: [PATCH 2/8] dma: Have dma_buf_read() / dma_buf_write() take a void pointer Date: Thu, 16 Dec 2021 13:35:52 +0100 Message-Id: <20211216123558.799425-3-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216123558.799425-1-philmd@redhat.com> References: <20211216123558.799425-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639658185213100001 DMA operations are run on any kind of buffer, not arrays of uint8_t. Convert dma_buf_read/dma_buf_write functions to take a void pointer argument and save us pointless casts to uint8_t *. Remove this pointless casts in the megasas device model. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/dma.h | 4 ++-- hw/scsi/megasas.c | 22 +++++++++++----------- softmmu/dma-helpers.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 531f02db14e..2721bf296a8 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -303,8 +303,8 @@ BlockAIOCB *dma_blk_read(BlockBackend *blk, BlockAIOCB *dma_blk_write(BlockBackend *blk, QEMUSGList *sg, uint64_t offset, uint32_t align, BlockCompletionFunc *cb, void *opaque); -uint64_t dma_buf_read(uint8_t *ptr, int32_t len, QEMUSGList *sg); -uint64_t dma_buf_write(uint8_t *ptr, int32_t len, QEMUSGList *sg); +uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg); +uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg); =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, QEMUSGList *sg, enum BlockAcctType type); diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 4ff51221d4c..733ca8e9865 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -847,7 +847,7 @@ static int megasas_ctrl_get_info(MegasasState *s, Megas= asCmd *cmd) MFI_INFO_PDMIX_SATA | MFI_INFO_PDMIX_LD); =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -877,7 +877,7 @@ static int megasas_mfc_get_defaults(MegasasState *s, Me= gasasCmd *cmd) info.disable_preboot_cli =3D 1; info.cluster_disable =3D 1; =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -898,7 +898,7 @@ static int megasas_dcmd_get_bios_info(MegasasState *s, = MegasasCmd *cmd) info.expose_all_drives =3D 1; } =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -909,7 +909,7 @@ static int megasas_dcmd_get_fw_time(MegasasState *s, Me= gasasCmd *cmd) =20 fw_time =3D cpu_to_le64(megasas_fw_time()); =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&fw_time, dcmd_size, &cmd->= qsg); + cmd->iov_size -=3D dma_buf_read(&fw_time, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -936,7 +936,7 @@ static int megasas_event_info(MegasasState *s, MegasasC= md *cmd) info.shutdown_seq_num =3D cpu_to_le32(s->shutdown_event); info.boot_seq_num =3D cpu_to_le32(s->boot_event); =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -1005,7 +1005,7 @@ static int megasas_dcmd_pd_get_list(MegasasState *s, = MegasasCmd *cmd) info.size =3D cpu_to_le32(offset); info.count =3D cpu_to_le32(num_pd_disks); =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, offset, &cmd->qsg); + cmd->iov_size -=3D dma_buf_read(&info, offset, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -1171,7 +1171,7 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, = MegasasCmd *cmd) info.ld_count =3D cpu_to_le32(num_ld_disks); trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); =20 - resid =3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg); + resid =3D dma_buf_read(&info, dcmd_size, &cmd->qsg); cmd->iov_size =3D dcmd_size - resid; return MFI_STAT_OK; } @@ -1220,7 +1220,7 @@ static int megasas_dcmd_ld_list_query(MegasasState *s= , MegasasCmd *cmd) info.size =3D dcmd_size; trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); =20 - resid =3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg); + resid =3D dma_buf_read(&info, dcmd_size, &cmd->qsg); cmd->iov_size =3D dcmd_size - resid; return MFI_STAT_OK; } @@ -1389,7 +1389,7 @@ static int megasas_dcmd_cfg_read(MegasasState *s, Meg= asasCmd *cmd) ld_offset +=3D sizeof(struct mfi_ld_config); } =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)data, info->size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(data, info->size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -1419,7 +1419,7 @@ static int megasas_dcmd_get_properties(MegasasState *= s, MegasasCmd *cmd) info.ecc_bucket_leak_rate =3D cpu_to_le16(1440); info.expose_encl_devices =3D 1; =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -1464,7 +1464,7 @@ static int megasas_dcmd_set_properties(MegasasState *= s, MegasasCmd *cmd) dcmd_size); return MFI_STAT_INVALID_PARAMETER; } - dma_buf_write((uint8_t *)&info, dcmd_size, &cmd->qsg); + dma_buf_write(&info, dcmd_size, &cmd->qsg); trace_megasas_dcmd_unsupported(cmd->index, cmd->iov_size); return MFI_STAT_OK; } diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 09e29997ee5..7f37548394e 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -317,12 +317,12 @@ static uint64_t dma_buf_rw(void *buf, int32_t len, QE= MUSGList *sg, return resid; } =20 -uint64_t dma_buf_read(uint8_t *ptr, int32_t len, QEMUSGList *sg) +uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg) { return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_FROM_DEVICE); } =20 -uint64_t dma_buf_write(uint8_t *ptr, int32_t len, QEMUSGList *sg) +uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg) { return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE); } --=20 2.33.1