Remove 'bus' argument from SCSI command completion callbacks
PATCH 1/1 Remove 'bus' argument from SCSI command completion callbacks
The 'bus' argument is now pointless, as we already pass the request itself and the bus can be derived from it.
Signed-off-by Hannes Reinecke <[email protected]>
--- hw/esp.c | 5 ++--- hw/lsi53c895a.c | 5 ++--- hw/scsi-bus.c | 3 +-- hw/scsi-disk.c | 8 ++++---- hw/scsi-generic.c | 6 +++--- hw/scsi.h | 3 +-- hw/usb-msd.c | 5 ++--- 7 files changed, 15 insertions(+), 20 deletions(-)
hw/esp.c +2 -3
@@ -390,10 +390,9 @@ static void esp_do_dma(ESPState *s) } } -static void esp_command_complete (SCSIBus *bus,int reason,SCSIRequest *req, -uint32_t arg) +static void esp_command_complete (SCSIRequest *req,int reason,uint32_t arg) { -ESPState *s =DO_UPCAST (ESPState, busdev.qdev, bus->qbus.parent); +ESPState *s =DO_UPCAST (ESPState, busdev.qdev, req->bus->qbus.parent);if (reason ==SCSI_REASON_DONE ) {DPRINTF ("SCSI Command complete\n" );
hw/lsi53c895a.c +2 -3
@@ -688,10 +688,9 @@ static int lsi_queue_tag(LSIState *s, uint32_t tag, uint32_t arg) }/* Callback to indicate that the SCSI layer has completed a transfer. */ -static void lsi_command_complete (SCSIBus *bus,int reason,SCSIRequest *req, -uint32_t arg) +static void lsi_command_complete (SCSIRequest *req,int reason,uint32_t arg) { -LSIState *s =DO_UPCAST (LSIState, dev.qdev, bus->qbus.parent); +LSIState *s =DO_UPCAST (LSIState, dev.qdev, req->bus->qbus.parent);int out; out = (s->sstat1 &PHASE_MASK ) ==PHASE_DO ;
hw/scsi-bus.c +1 -2
@@ -594,6 +594,5 @@ void scsi_req_complete(SCSIRequest *req) {assert (req->status !=-1 );scsi_req_dequeue (req); - req->bus->complete (req->bus,SCSI_REASON_DONE , - req, req->status); + req->bus->complete (req,SCSI_REASON_DONE , req->status); }
hw/scsi-disk.c +4 -4
@@ -156,7 +156,7 @@ static void scsi_read_complete(void * opaque, int ret)DPRINTF ("Data ready tag=0x%x len=%zd\n" , r->req.tag, iov_len); - r->req.bus->complete (r->req.bus,SCSI_REASON_DATA , &r->req, iov_len); + r->req.bus->complete (&r->req,SCSI_REASON_DATA , iov_len); }
@@ -176,7 +176,7 @@ static void scsi_read_data(SCSIRequest *req)if (r->sector_count == (uint32_t )-1 ) {DPRINTF ("Read buf_len=%zd\n" , r->iov[0 ].iov_len); r->sector_count =0 ; - r->req.bus->complete (r->req.bus,SCSI_REASON_DATA , &r->req, + r->req.bus->complete (&r->req,SCSI_REASON_DATA , r->iov[0 ].iov_len);return ; }
@@ -226,7 +226,7 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type)vm_stop (0 ); }else {if (type ==SCSI_REQ_STATUS_RETRY_READ ) { - r->req.bus->complete (r->req.bus,SCSI_REASON_DATA , &r->req,0 ); + r->req.bus->complete (&r->req,SCSI_REASON_DATA ,0 ); }if (error ==EBADR ) { scsi_command_complete(r, CHECK_CONDITION,
@@ -270,7 +270,7 @@ static void scsi_write_complete(void * opaque, int ret) r->iov[0 ].iov_len = len; }DPRINTF ("Write complete tag=0x%x more=%d\n" , r->req.tag, len); - r->req.bus->complete (r->req.bus,SCSI_REASON_DATA , &r->req, len); + r->req.bus->complete (&r->req,SCSI_REASON_DATA , len); } }
hw/scsi-generic.c +3 -3
@@ -196,7 +196,7 @@ static void scsi_read_complete(void * opaque, int ret)DPRINTF ("Data ready tag=0x%x len=%d\n" , r->req.tag, len); r->len =-1 ; - r->req.bus->complete (r->req.bus,SCSI_REASON_DATA , &r->req, len); + r->req.bus->complete (&r->req,SCSI_REASON_DATA , len);if (len ==0 )scsi_command_complete (r,0 ); }
@@ -226,7 +226,7 @@ static void scsi_read_data(SCSIRequest *req)DPRINTF ("Sense: %d %d %d %d %d %d %d %d\n" , r->buf[0 ], r->buf[1 ], r->buf[2 ], r->buf[3 ], r->buf[4 ], r->buf[5 ], r->buf[6 ], r->buf[7 ]); - r->req.bus->complete (r->req.bus,SCSI_REASON_DATA , &r->req, s->senselen); + r->req.bus->complete (&r->req,SCSI_REASON_DATA , s->senselen);/* Clear sensebuf after REQUEST_SENSE */ scsi_clear_sense (s);return ;
@@ -272,7 +272,7 @@ static int scsi_write_data(SCSIRequest *req)if (r->len ==0 ) { r->len = r->buflen; - r->req.bus->complete (r->req.bus,SCSI_REASON_DATA , &r->req, r->len); + r->req.bus->complete (&r->req,SCSI_REASON_DATA , r->len);return 0 ; }
hw/scsi.h +1 -2
@@ -18,8 +18,7 @@ typedef struct SCSIBus SCSIBus;typedef struct SCSIDevice SCSIDevice ;typedef struct SCSIDeviceInfo SCSIDeviceInfo ;typedef struct SCSIRequest SCSIRequest ; -typedef void (*scsi_completionfn )(SCSIBus *bus,int reason,SCSIRequest *req, -uint32_t arg); +typedef void (*scsi_completionfn )(SCSIRequest *req,int reason,uint32_t arg);enum SCSIXferMode {SCSI_XFER_NONE ,/* TEST_UNIT_READY, ... */
hw/usb-msd.c +2 -3
@@ -174,10 +174,9 @@ static void usb_msd_send_status(MSDState *s)memcpy (s->usb_buf, &csw,13 ); } -static void usb_msd_command_complete (SCSIBus *bus,int reason,SCSIRequest *req, -uint32_t arg) +static void usb_msd_command_complete (SCSIRequest *req,int reason,uint32_t arg) { -MSDState *s =DO_UPCAST (MSDState, dev.qdev, bus->qbus.parent); +MSDState *s =DO_UPCAST (MSDState, dev.qdev, req->bus->qbus.parent);USBPacket *p = s->packet;if (req->tag != s->tag) {
Signature · 1 line
1.6.0.2
Quoted 13 lines · Hannes Reinecke
The 'bus' argument is now pointless, as we already pass the request itself and the bus can be derived from it.
Signed-off-by Hannes Reinecke <[email protected]>---
hw/esp.c | 5 ++---
hw/lsi53c895a.c | 5 ++---
hw/scsi-bus.c | 3 +--
hw/scsi-disk.c | 8 ++++----
hw/scsi-generic.c | 6 +++---
hw/scsi.h | 3 +--
hw/usb-msd.c | 5 ++---
Quoted 1 line
7 files changed, 15 insertions(+), 20 deletions(-)
Reviewed-by Stefan Hajnoczi <[email protected]>