ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: make write_data return void 

The return value is unused anyway.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Paolo Bonzini 2011-04-22 09:39:16 +02:00
parent efb9ee0248
commit 42741212eb
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/scsi-disk.c
View File

@ -269,7 +269,7 @@ static void scsi_write_complete(void * opaque, int ret)
} }
} }
static int scsi_write_data(SCSIRequest *req) static void scsi_write_data(SCSIRequest *req)
{ {
SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
@ -281,7 +281,7 @@ static int scsi_write_data(SCSIRequest *req)
if (r->req.cmd.mode != SCSI_XFER_TO_DEV) { if (r->req.cmd.mode != SCSI_XFER_TO_DEV) {
DPRINTF("Data transfer direction invalid\n"); DPRINTF("Data transfer direction invalid\n");
scsi_write_complete(r, -EINVAL); scsi_write_complete(r, -EINVAL);
return 0; return;
} }
n = r->iov.iov_len / 512; n = r->iov.iov_len / 512;
@ -296,8 +296,6 @@ static int scsi_write_data(SCSIRequest *req)
/* Invoke completion routine to fetch data from host. */ /* Invoke completion routine to fetch data from host. */
scsi_write_complete(r, 0); scsi_write_complete(r, 0);
} }
return 0;
} }
static void scsi_dma_restart_bh(void *opaque) static void scsi_dma_restart_bh(void *opaque)

7
hw/scsi-generic.c
View File

@ -277,7 +277,7 @@ static void scsi_write_complete(void * opaque, int ret)
/* Write data to a scsi device. Returns nonzero on failure. /* Write data to a scsi device. Returns nonzero on failure.
The transfer may complete asynchronously. */ The transfer may complete asynchronously. */
static int scsi_write_data(SCSIRequest *req) static void scsi_write_data(SCSIRequest *req)
{ {
SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, req->dev); SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, req->dev);
SCSIGenericReq *r = DO_UPCAST(SCSIGenericReq, req, req); SCSIGenericReq *r = DO_UPCAST(SCSIGenericReq, req, req);
@ -287,16 +287,13 @@ static int scsi_write_data(SCSIRequest *req)
if (r->len == 0) { if (r->len == 0) {
r->len = r->buflen; r->len = r->buflen;
scsi_req_data(&r->req, r->len); scsi_req_data(&r->req, r->len);
return 0; return;
} }
ret = execute_command(s->bs, r, SG_DXFER_TO_DEV, scsi_write_complete); ret = execute_command(s->bs, r, SG_DXFER_TO_DEV, scsi_write_complete);
if (ret < 0) { if (ret < 0) {
scsi_command_complete(r, ret); scsi_command_complete(r, ret);
return 1;
} }
return 0;
} }
/* Return a pointer to the data buffer. */ /* Return a pointer to the data buffer. */

2
hw/scsi.h
View File

@ -77,7 +77,7 @@ struct SCSIDeviceInfo {
void (*free_req)(SCSIRequest *req); void (*free_req)(SCSIRequest *req);
int32_t (*send_command)(SCSIRequest *req, uint8_t *buf); int32_t (*send_command)(SCSIRequest *req, uint8_t *buf);
void (*read_data)(SCSIRequest *req); void (*read_data)(SCSIRequest *req);
int (*write_data)(SCSIRequest *req); void (*write_data)(SCSIRequest *req);
void (*cancel_io)(SCSIRequest *req); void (*cancel_io)(SCSIRequest *req);
uint8_t *(*get_buf)(SCSIRequest *req); uint8_t *(*get_buf)(SCSIRequest *req);
int (*get_sense)(SCSIRequest *req, uint8_t *buf, int len); int (*get_sense)(SCSIRequest *req, uint8_t *buf, int len);