From nobody Mon Feb 9 18:19:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642507420; cv=none; d=zohomail.com; s=zohoarc; b=hrm/IQRK9Dske76nY+Rfl7t2c1p+x3lrlj+hIcpTKOX0Rn8MHi6+yjKGTp/sLZuq63v7g2IgdXojhC6Jy53rLSlXa3iAMxWS8C/BFa5Ak7cAotCDspRkWAmJ/1rqqtjmR8dPTJO+Wmaohn98U55108lJEZY5uZ/3s2vcGjXrg3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642507420; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8wo73c9dZDc7RaZjwKEQssROsQfwZbADgI/fn6bB0Nc=; b=UhuhhqxlRGuurUG1dxxPQPiKTiw+346ZRIVEBKrLvAIlz9Lt18EKmUFQGdBC7WmOh3QECj08JUViAzQZWOVaKTT+dMpk9N1egwqCgUVfXyDGBN+P4pLRUzBDoGJO3utHBI9tJne8sEl2UN+TilMBCBqdYg/krV5Vesg82H7jixQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1642507420514911.3011137550893; Tue, 18 Jan 2022 04:03:40 -0800 (PST) Received: by mail-wm1-f44.google.com with SMTP id c66so27132834wma.5 for ; Tue, 18 Jan 2022 04:03:39 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id 9sm15064256wrb.77.2022.01.18.04.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 04:03:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8wo73c9dZDc7RaZjwKEQssROsQfwZbADgI/fn6bB0Nc=; b=WY/ttxZZYOodkmJCYCoahRlUu8XVIftShWyRMyhqu8YEfagBjmSPdfFzk/HfQHKqyk xXSk9VDgrRljFnR9RqfY4AWvFGE8RzRYBWPI8dSqFZjMVniilNbt8MehaI5l2qfEfH9a Zb8WsKNJER2hAx5c8F8vjT2rvTwASWie5f71ZIwIf3sNdSKtamhJNOQ8LcFHykGsFKrK LMKkgB4o7l5vG9MSIHFhH8tys1VCvLfSCeUadkgH7GSm2cjPL2ZItoYBfxeeZEAkTeKR R7YrwTXFXQr30yNKhMFdle+JRj55lnAG13BDGT5NzREPk38ecu6fastCg8bZc3tLLvw0 OD6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8wo73c9dZDc7RaZjwKEQssROsQfwZbADgI/fn6bB0Nc=; b=yHqFJVksk8EMAlDjjGD4tS4Ef06nM+S1SkXHQ4sYUOhWQajxogs5pY2Bn6KIi/cq5Y tUlPt7DbIVkiRVR3E4DbvSdGnAwBUi4U9rloeHQTfah0WRzZdI5j/sU1jMQBDzqO+ZsH 944H7tJut/lFJcAuxhcRT9LtPSvHYr+Iai2ZXbtwdyxa9eLXwHdbUxktSBqfzUOzHHZ4 F/LOmDXa1QBzPFWepPY0T4X5uRvEnjXJkU1jhckKkJkMjOxnfREFLvIIArzLBtgoS5C/ dGD1Npkrbl+NIi0NW/pQqbifj+uMbkcg17pSUPWn/4q1dySReUv+mvn6f5uueUXP8ctJ 4mzg== X-Gm-Message-State: AOAM530zGVnMn2BCTZfdFSZyLea5xX8IoKtsYM5b/VgE3AdmqEyk3eE9 Ln6qm0AC7xGk+YeSk8QVYRz8Es4+BfQ= X-Google-Smtp-Source: ABdhPJyxl+LEYm9aUb6LykG+WMQYJTCE4yQHm+i6yjTHkEO3W0xgghLThhdvqmmwO73NawpZ2goKPA== X-Received: by 2002:a05:600c:219:: with SMTP id 25mr29195455wmi.71.1642507418722; Tue, 18 Jan 2022 04:03:38 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , David Hildenbrand , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 14/19] hw/scsi: Rename SCSIRequest::resid as 'residual' Date: Tue, 18 Jan 2022 13:02:24 +0100 Message-Id: <20220118120229.196337-15-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118120229.196337-1-f4bug@amsat.org> References: <20220118120229.196337-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642507421255100001 From: Philippe Mathieu-Daud=C3=A9 The 'resid' field is slightly confusing and could be interpreted as some ID. Rename it as 'residual' which is clearer to review. No logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Message-Id: <20220111184309.28637-8-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/scsi/scsi.h | 4 ++-- hw/scsi/megasas.c | 42 +++++++++++++++++++++++++----------------- hw/scsi/scsi-bus.c | 10 +++++----- hw/scsi/scsi-disk.c | 4 ++-- softmmu/dma-helpers.c | 26 +++++++++++++------------- 5 files changed, 47 insertions(+), 39 deletions(-) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 2ef80af6dca..b27d133b113 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -30,7 +30,7 @@ struct SCSIRequest { int16_t status; int16_t host_status; void *hba_private; - size_t resid; + size_t residual; SCSICommand cmd; NotifierList cancel_notifiers; =20 @@ -125,7 +125,7 @@ struct SCSIBusInfo { void *hba_private); void (*transfer_data)(SCSIRequest *req, uint32_t arg); void (*fail)(SCSIRequest *req); - void (*complete)(SCSIRequest *req, size_t resid); + void (*complete)(SCSIRequest *req, size_t residual); void (*cancel)(SCSIRequest *req); void (*change)(SCSIBus *bus, SCSIDevice *dev, SCSISense sense); QEMUSGList *(*get_sg_list)(SCSIRequest *req); diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index dc9bbdb740e..cb019549371 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1045,7 +1045,8 @@ static int megasas_pd_get_info_submit(SCSIDevice *sde= v, int lun, uint64_t pd_size; uint16_t pd_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint8_t cmdbuf[6]; - size_t len, resid; + size_t len; + size_t residual; =20 if (!cmd->iov_buf) { cmd->iov_buf =3D g_malloc0(dcmd_size); @@ -1112,9 +1113,10 @@ static int megasas_pd_get_info_submit(SCSIDevice *sd= ev, int lun, info->connected_port_bitmap =3D 0x1; info->device_speed =3D 1; info->link_speed =3D 1; - resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_= UNSPECIFIED); + residual =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); - cmd->iov_size =3D dcmd_size - resid; + cmd->iov_size =3D dcmd_size - residual; cmd->iov_buf =3D NULL; return MFI_STAT_OK; } @@ -1149,7 +1151,8 @@ static int megasas_dcmd_pd_get_info(MegasasState *s, = MegasasCmd *cmd) static int megasas_dcmd_ld_get_list(MegasasState *s, MegasasCmd *cmd) { struct mfi_ld_list info; - size_t dcmd_size =3D sizeof(info), resid; + size_t dcmd_size =3D sizeof(info); + size_t residual; uint32_t num_ld_disks =3D 0, max_ld_disks; uint64_t ld_size; BusChild *kid; @@ -1184,8 +1187,9 @@ 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(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECI= FIED); - cmd->iov_size =3D dcmd_size - resid; + residual =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size =3D dcmd_size - residual; return MFI_STAT_OK; } =20 @@ -1193,7 +1197,8 @@ static int megasas_dcmd_ld_list_query(MegasasState *s= , MegasasCmd *cmd) { uint16_t flags; struct mfi_ld_targetid_list info; - size_t dcmd_size =3D sizeof(info), resid; + size_t dcmd_size =3D sizeof(info); + size_t residual; uint32_t num_ld_disks =3D 0, max_ld_disks =3D s->fw_luns; BusChild *kid; =20 @@ -1233,8 +1238,9 @@ 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(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECI= FIED); - cmd->iov_size =3D dcmd_size - resid; + residual =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size =3D dcmd_size - residual; return MFI_STAT_OK; } =20 @@ -1244,7 +1250,8 @@ static int megasas_ld_get_info_submit(SCSIDevice *sde= v, int lun, struct mfi_ld_info *info =3D cmd->iov_buf; size_t dcmd_size =3D sizeof(struct mfi_ld_info); uint8_t cdb[6]; - ssize_t len, resid; + ssize_t len; + size_t residual; uint16_t sdev_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint64_t ld_size; =20 @@ -1283,9 +1290,10 @@ static int megasas_ld_get_info_submit(SCSIDevice *sd= ev, int lun, info->ld_config.span[0].num_blocks =3D info->size; info->ld_config.span[0].array_ref =3D cpu_to_le16(sdev_id); =20 - resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_= UNSPECIFIED); + residual =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); - cmd->iov_size =3D dcmd_size - resid; + cmd->iov_size =3D dcmd_size - residual; cmd->iov_buf =3D NULL; return MFI_STAT_OK; } @@ -1617,13 +1625,13 @@ static int megasas_handle_dcmd(MegasasState *s, Meg= asasCmd *cmd) } =20 static int megasas_finish_internal_dcmd(MegasasCmd *cmd, - SCSIRequest *req, size_t resid) + SCSIRequest *req, size_t residual) { int retval =3D MFI_STAT_OK; int lun =3D req->lun; =20 trace_megasas_dcmd_internal_finish(cmd->index, cmd->dcmd_opcode, lun); - cmd->iov_size -=3D resid; + cmd->iov_size -=3D residual; switch (cmd->dcmd_opcode) { case MFI_DCMD_PD_GET_INFO: retval =3D megasas_pd_get_info_submit(req->dev, lun, cmd); @@ -1865,12 +1873,12 @@ static void megasas_xfer_complete(SCSIRequest *req,= uint32_t len) } } =20 -static void megasas_command_complete(SCSIRequest *req, size_t resid) +static void megasas_command_complete(SCSIRequest *req, size_t residual) { MegasasCmd *cmd =3D req->hba_private; uint8_t cmd_status =3D MFI_STAT_OK; =20 - trace_megasas_command_complete(cmd->index, req->status, resid); + trace_megasas_command_complete(cmd->index, req->status, residual); =20 if (req->io_canceled) { return; @@ -1880,7 +1888,7 @@ static void megasas_command_complete(SCSIRequest *req= , size_t resid) /* * Internal command complete */ - cmd_status =3D megasas_finish_internal_dcmd(cmd, req, resid); + cmd_status =3D megasas_finish_internal_dcmd(cmd, req, residual); if (cmd_status =3D=3D MFI_STAT_INVALID_STATUS) { return; } diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 2b5e9dca311..3466e680ac7 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -760,7 +760,7 @@ SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, = uint32_t lun, } =20 req->cmd =3D cmd; - req->resid =3D req->cmd.xfer; + req->residual =3D req->cmd.xfer; =20 switch (buf[0]) { case INQUIRY: @@ -1408,7 +1408,7 @@ void scsi_req_data(SCSIRequest *req, int len) trace_scsi_req_data(req->dev->id, req->lun, req->tag, len); assert(req->cmd.mode !=3D SCSI_XFER_NONE); if (!req->sg) { - req->resid -=3D len; + req->residual -=3D len; req->bus->info->transfer_data(req, len); return; } @@ -1421,9 +1421,9 @@ void scsi_req_data(SCSIRequest *req, int len) =20 buf =3D scsi_req_get_buf(req); if (req->cmd.mode =3D=3D SCSI_XFER_FROM_DEV) { - req->resid =3D dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPECIF= IED); + req->residual =3D dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPE= CIFIED); } else { - req->resid =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSPECI= FIED); + req->residual =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSP= ECIFIED); } scsi_req_continue(req); } @@ -1512,7 +1512,7 @@ void scsi_req_complete(SCSIRequest *req, int status) =20 scsi_req_ref(req); scsi_req_dequeue(req); - req->bus->info->complete(req, req->resid); + req->bus->info->complete(req, req->residual); =20 /* Cancelled requests might end up being completed instead of cancelle= d */ notifier_list_notify(&req->cancel_notifiers, req); diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index d4914178ea0..9c0dc7b9468 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -420,7 +420,7 @@ static void scsi_do_read(SCSIDiskReq *r, int ret) =20 if (r->req.sg) { dma_acct_start(s->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_R= EAD); - r->req.resid -=3D r->req.sg->size; + r->req.residual -=3D r->req.sg->size; r->req.aiocb =3D dma_blk_io(blk_get_aio_context(s->qdev.conf.blk), r->req.sg, r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, @@ -580,7 +580,7 @@ static void scsi_write_data(SCSIRequest *req) =20 if (r->req.sg) { dma_acct_start(s->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_W= RITE); - r->req.resid -=3D r->req.sg->size; + r->req.residual -=3D r->req.sg->size; r->req.aiocb =3D dma_blk_io(blk_get_aio_context(s->qdev.conf.blk), r->req.sg, r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index b0be1564797..4563a775aa7 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -294,49 +294,49 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk, } =20 =20 -static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residp, +static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residual, QEMUSGList *sg, DMADirection dir, MemTxAttrs attrs) { uint8_t *ptr =3D buf; - uint64_t resid; + uint64_t xresidual; int sg_cur_index; MemTxResult res =3D MEMTX_OK; =20 - resid =3D sg->size; + xresidual =3D sg->size; sg_cur_index =3D 0; - len =3D MIN(len, resid); + len =3D MIN(len, xresidual); while (len > 0) { ScatterGatherEntry entry =3D sg->sg[sg_cur_index++]; int32_t xfer =3D MIN(len, entry.len); res |=3D dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs); ptr +=3D xfer; len -=3D xfer; - resid -=3D xfer; + xresidual -=3D xfer; } =20 - if (residp) { - *residp =3D resid; + if (residual) { + *residual =3D xresidual; } return res; } =20 uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs) { - uint64_t resid; + uint64_t residual; =20 - dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_FROM_DEVICE, attrs); + dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_FROM_DEVICE, attrs); =20 - return resid; + return residual; } =20 uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs) { - uint64_t resid; + uint64_t residual; =20 - dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_TO_DEVICE, attrs); + dma_buf_rw(ptr, len, &residual, sg, DMA_DIRECTION_TO_DEVICE, attrs); =20 - return resid; + return residual; } =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, --=20 2.34.1