From nobody Sun Feb 8 17:21:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1605553123; cv=none; d=zohomail.com; s=zohoarc; b=Tn4sRZlVyZpXJzjOMUrn+XzlU7UrDbuO4930StXx+Ktpif8XfiUEPfIZYPKrq6aioKmsOc4KjkwDCkiyX1EaG8/cr00JkWFmIm+vSP5jyJnwm4/Fj5bEWNK7Pfz7v25S50KVbjpZNbygE5KaocPmDYrWtAV5jxN3Ad7P6jkjfoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605553123; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=YtZo3uZ7D3NrUb6m5h8a86cBSV/SxheYjh51X9hDPhw=; b=QP+M5LX6aErwA6XMlD9uMk6hDQSD8P4iK3bUzwLAt0v1Tyw+sJVLgDKmRLtOH1FQbo1p5Qb9AGlqIptvgtkAAIqKhYG21yB61xx+wQQitHtBabRU8+SqP/RJFk+yiFFeaW679QcpOURacdh74+uhMkMGq6IWgvNf1RNk80n7+vk= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160555312345016.5802053605953; Mon, 16 Nov 2020 10:58:43 -0800 (PST) Received: from localhost ([::1]:39082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keji6-0001q7-AM for importer@patchew.org; Mon, 16 Nov 2020 13:58:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kejQt-0003tp-Ui for qemu-devel@nongnu.org; Mon, 16 Nov 2020 13:40:57 -0500 Received: from mx2.suse.de ([195.135.220.15]:45328) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kejQo-0000lE-O1 for qemu-devel@nongnu.org; Mon, 16 Nov 2020 13:40:55 -0500 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 42CA9B00D; Mon, 16 Nov 2020 18:40:49 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Hannes Reinecke To: Paolo Bonzini Subject: [PATCH 2/7] scsi: drop 'result' argument from command_complete callback Date: Mon, 16 Nov 2020 19:40:36 +0100 Message-Id: <20201116184041.60465-3-hare@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20201116184041.60465-1-hare@suse.de> References: <20201116184041.60465-1-hare@suse.de> 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=195.135.220.15; envelope-from=hare@suse.de; helo=mx2.suse.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/16 12:53:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Hannes Reinecke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The command complete callback has a SCSIRequest as the first argument, and the status field of that structure is identical to the 'status' argument. So drop the argument from the callback. Signed-off-by: Hannes Reinecke --- hw/scsi/esp-pci.c | 5 ++--- hw/scsi/esp.c | 7 +++---- hw/scsi/lsi53c895a.c | 6 +++--- hw/scsi/megasas.c | 6 ++---- hw/scsi/mptsas.c | 5 +++-- hw/scsi/scsi-bus.c | 2 +- hw/scsi/spapr_vscsi.c | 10 +++++----- hw/scsi/virtio-scsi.c | 5 ++--- hw/scsi/vmw_pvscsi.c | 4 ++-- hw/usb/dev-storage.c | 6 +++--- hw/usb/dev-uas.c | 7 +++---- include/hw/scsi/esp.h | 2 +- include/hw/scsi/scsi.h | 2 +- 13 files changed, 31 insertions(+), 36 deletions(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 2ce96dc56e..4d7c2cab56 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -329,13 +329,12 @@ static const VMStateDescription vmstate_esp_pci_scsi = =3D { } }; =20 -static void esp_pci_command_complete(SCSIRequest *req, uint32_t status, - size_t resid) +static void esp_pci_command_complete(SCSIRequest *req, size_t resid) { ESPState *s =3D req->hba_private; PCIESPState *pci =3D container_of(s, PCIESPState, esp); =20 - esp_command_complete(req, status, resid); + esp_command_complete(req, resid); pci->dma_regs[DMA_WBC] =3D 0; pci->dma_regs[DMA_STAT] |=3D DMA_STAT_DONE; } diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index b84e0fe33e..93d9c9c7b9 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -485,8 +485,7 @@ static void esp_report_command_complete(ESPState *s, ui= nt32_t status) } } =20 -void esp_command_complete(SCSIRequest *req, uint32_t status, - size_t resid) +void esp_command_complete(SCSIRequest *req, size_t resid) { ESPState *s =3D req->hba_private; =20 @@ -495,11 +494,11 @@ void esp_command_complete(SCSIRequest *req, uint32_t = status, * interrupt has been handled. */ trace_esp_command_complete_deferred(); - s->deferred_status =3D status; + s->deferred_status =3D req->status; s->deferred_complete =3D true; return; } - esp_report_command_complete(s, status); + esp_report_command_complete(s, req->status); } =20 void esp_transfer_data(SCSIRequest *req, uint32_t len) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 7d13c7dc1c..a4e58580e4 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -787,14 +787,14 @@ static int lsi_queue_req(LSIState *s, SCSIRequest *re= q, uint32_t len) } =20 /* Callback to indicate that the SCSI layer has completed a command. */ -static void lsi_command_complete(SCSIRequest *req, uint32_t status, size_t= resid) +static void lsi_command_complete(SCSIRequest *req, size_t resid) { LSIState *s =3D LSI53C895A(req->bus->qbus.parent); int out; =20 out =3D (s->sstat1 & PHASE_MASK) =3D=3D PHASE_DO; - trace_lsi_command_complete(status); - s->status =3D status; + trace_lsi_command_complete(req->status); + s->status =3D req->status; s->command_complete =3D 2; if (s->waiting && s->dbc !=3D 0) { /* Raise phase mismatch for short transfers. */ diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index e24c12d7ee..35867dbd40 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1852,13 +1852,12 @@ static void megasas_xfer_complete(SCSIRequest *req,= uint32_t len) } } =20 -static void megasas_command_complete(SCSIRequest *req, uint32_t status, - size_t resid) +static void megasas_command_complete(SCSIRequest *req, size_t resid) { MegasasCmd *cmd =3D req->hba_private; uint8_t cmd_status =3D MFI_STAT_OK; =20 - trace_megasas_command_complete(cmd->index, status, resid); + trace_megasas_command_complete(cmd->index, req->status, resid); =20 if (req->io_canceled) { return; @@ -1873,7 +1872,6 @@ static void megasas_command_complete(SCSIRequest *req= , uint32_t status, return; } } else { - req->status =3D status; trace_megasas_scsi_complete(cmd->index, req->status, cmd->iov_size, req->cmd.xfer); if (req->status !=3D GOOD) { diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 135e7d96e4..d4fbfb2da7 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -1133,7 +1133,7 @@ static QEMUSGList *mptsas_get_sg_list(SCSIRequest *sr= eq) } =20 static void mptsas_command_complete(SCSIRequest *sreq, - uint32_t status, size_t resid) + size_t resid) { MPTSASRequest *req =3D sreq->hba_private; MPTSASState *s =3D req->dev; @@ -1143,7 +1143,8 @@ static void mptsas_command_complete(SCSIRequest *sreq, hwaddr sense_buffer_addr =3D req->dev->sense_buffer_high_addr | req->scsi_io.SenseBufferLowAddr; =20 - trace_mptsas_command_complete(s, req->scsi_io.MsgContext, status, resi= d); + trace_mptsas_command_complete(s, req->scsi_io.MsgContext, + sreq->status, resid); =20 sense_len =3D scsi_req_get_sense(sreq, sense_buf, SCSI_SENSE_BUF_SIZE); if (sense_len > 0) { diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 3284a5d1fb..17ce3238d7 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1415,7 +1415,7 @@ void scsi_req_complete(SCSIRequest *req, int status) =20 scsi_req_ref(req); scsi_req_dequeue(req); - req->bus->info->complete(req, req->status, req->resid); + req->bus->info->complete(req, req->resid); =20 /* Cancelled requests might end up being completed instead of cancelle= d */ notifier_list_notify(&req->cancel_notifiers, req); diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index 4aa0224c47..d653b5a6ad 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -551,19 +551,19 @@ static void vscsi_transfer_data(SCSIRequest *sreq, ui= nt32_t len) } =20 /* Callback to indicate that the SCSI layer has completed a transfer. */ -static void vscsi_command_complete(SCSIRequest *sreq, uint32_t status, siz= e_t resid) +static void vscsi_command_complete(SCSIRequest *sreq, size_t resid) { VSCSIState *s =3D VIO_SPAPR_VSCSI_DEVICE(sreq->bus->qbus.parent); vscsi_req *req =3D sreq->hba_private; int32_t res_in =3D 0, res_out =3D 0; =20 - trace_spapr_vscsi_command_complete(sreq->tag, status, req); + trace_spapr_vscsi_command_complete(sreq->tag, sreq->status, req); if (req =3D=3D NULL) { fprintf(stderr, "VSCSI: Can't find request for tag 0x%x\n", sreq->= tag); return; } =20 - if (status =3D=3D CHECK_CONDITION) { + if (sreq->status =3D=3D CHECK_CONDITION) { req->senselen =3D scsi_req_get_sense(req->sreq, req->sense, sizeof(req->sense)); trace_spapr_vscsi_command_complete_sense_data1(req->senselen, @@ -574,8 +574,8 @@ static void vscsi_command_complete(SCSIRequest *sreq, u= int32_t status, size_t re req->sense[12], req->sense[13], req->sense[14], req->sense= [15]); } =20 - trace_spapr_vscsi_command_complete_status(status); - if (status =3D=3D 0) { + trace_spapr_vscsi_command_complete_status(sreq->status); + if (sreq->status =3D=3D 0) { /* We handle overflows, not underflows for normal commands, * but hopefully nobody cares */ diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index c9873d5af7..64cd852d82 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -493,8 +493,7 @@ static void virtio_scsi_complete_cmd_req(VirtIOSCSIReq = *req) virtio_scsi_complete_req(req); } =20 -static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status, - size_t resid) +static void virtio_scsi_command_complete(SCSIRequest *r, size_t resid) { VirtIOSCSIReq *req =3D r->hba_private; uint8_t sense[SCSI_SENSE_BUF_SIZE]; @@ -506,7 +505,7 @@ static void virtio_scsi_command_complete(SCSIRequest *r= , uint32_t status, } =20 req->resp.cmd.response =3D VIRTIO_SCSI_S_OK; - req->resp.cmd.status =3D status; + req->resp.cmd.status =3D r->status; if (req->resp.cmd.status =3D=3D GOOD) { req->resp.cmd.resid =3D virtio_tswap32(vdev, resid); } else { diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index a63d25de48..0da378ed50 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -511,7 +511,7 @@ pvscsi_write_sense(PVSCSIRequest *r, uint8_t *sense, in= t len) } =20 static void -pvscsi_command_complete(SCSIRequest *req, uint32_t status, size_t resid) +pvscsi_command_complete(SCSIRequest *req, size_t resid) { PVSCSIRequest *pvscsi_req =3D req->hba_private; PVSCSIState *s; @@ -528,7 +528,7 @@ pvscsi_command_complete(SCSIRequest *req, uint32_t stat= us, size_t resid) pvscsi_req->cmp.hostStatus =3D BTSTAT_DATARUN; } =20 - pvscsi_req->cmp.scsiStatus =3D status; + pvscsi_req->cmp.scsiStatus =3D req->status; if (pvscsi_req->cmp.scsiStatus =3D=3D CHECK_CONDITION) { uint8_t sense[SCSI_SENSE_BUF_SIZE]; int sense_len =3D diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 648340323f..d1aeebe2ce 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -284,17 +284,17 @@ static void usb_msd_transfer_data(SCSIRequest *req, u= int32_t len) } } =20 -static void usb_msd_command_complete(SCSIRequest *req, uint32_t status, si= ze_t resid) +static void usb_msd_command_complete(SCSIRequest *req, size_t resid) { MSDState *s =3D DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent); USBPacket *p =3D s->packet; =20 - DPRINTF("Command complete %d tag 0x%x\n", status, req->tag); + DPRINTF("Command complete %d tag 0x%x\n", req->status, req->tag); =20 s->csw.sig =3D cpu_to_le32(0x53425355); s->csw.tag =3D cpu_to_le32(req->tag); s->csw.residue =3D cpu_to_le32(s->data_len); - s->csw.status =3D status !=3D 0; + s->csw.status =3D req->status !=3D 0; =20 if (s->packet) { if (s->data_len =3D=3D 0 && s->mode =3D=3D USB_MSDM_DATAOUT) { diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index cec071d96c..202e9cc4b7 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -597,17 +597,16 @@ static void usb_uas_scsi_transfer_data(SCSIRequest *r= , uint32_t len) } } =20 -static void usb_uas_scsi_command_complete(SCSIRequest *r, - uint32_t status, size_t resid) +static void usb_uas_scsi_command_complete(SCSIRequest *r, size_t resid) { UASRequest *req =3D r->hba_private; =20 - trace_usb_uas_scsi_complete(req->uas->dev.addr, req->tag, status, resi= d); + trace_usb_uas_scsi_complete(req->uas->dev.addr, req->tag, r->status, r= esid); req->complete =3D true; if (req->data) { usb_uas_complete_data_packet(req); } - usb_uas_queue_sense(req, status); + usb_uas_queue_sense(req, r->status); scsi_req_unref(req->req); } =20 diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h index 60cc3047a5..d8a6263c13 100644 --- a/include/hw/scsi/esp.h +++ b/include/hw/scsi/esp.h @@ -151,7 +151,7 @@ struct SysBusESPState { =20 void esp_dma_enable(ESPState *s, int irq, int level); void esp_request_cancelled(SCSIRequest *req); -void esp_command_complete(SCSIRequest *req, uint32_t status, size_t resid); +void esp_command_complete(SCSIRequest *req, size_t resid); void esp_transfer_data(SCSIRequest *req, uint32_t len); void esp_hard_reset(ESPState *s); uint64_t esp_reg_read(ESPState *s, uint32_t saddr); diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 21a6249743..23a9b23e50 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -123,7 +123,7 @@ struct SCSIBusInfo { int (*parse_cdb)(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf, void *hba_private); void (*transfer_data)(SCSIRequest *req, uint32_t arg); - void (*complete)(SCSIRequest *req, uint32_t arg, size_t resid); + void (*complete)(SCSIRequest *req, size_t resid); void (*cancel)(SCSIRequest *req); void (*change)(SCSIBus *bus, SCSIDevice *dev, SCSISense sense); QEMUSGList *(*get_sg_list)(SCSIRequest *req); --=20 2.16.4