Commit 42741212 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

scsi: make write_data return void 



The return value is unused anyway.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent efb9ee02

hw/scsi-disk.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

    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) {

        DPRINTF("Data transfer direction invalid\n");

        scsi_write_complete(r, -EINVAL);

        return 0;

        return;

    }



    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.  */

        scsi_write_complete(r, 0);

    }



    return 0;

}



static void scsi_dma_restart_bh(void *opaque)

hw/scsi-generic.c

+2 −5
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static void scsi_write_complete(void * opaque, int ret) 


/* Write data to a scsi device.  Returns nonzero on failure.

   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);

    SCSIGenericReq *r = DO_UPCAST(SCSIGenericReq, req, req);
@@ -287,16 +287,13 @@ static int scsi_write_data(SCSIRequest *req) 
    if (r->len == 0) {

        r->len = r->buflen;

        scsi_req_data(&r->req, r->len);

        return 0;

        return;

    }



    ret = execute_command(s->bs, r, SG_DXFER_TO_DEV, scsi_write_complete);

    if (ret < 0) {

        scsi_command_complete(r, ret);

        return 1;

    }



    return 0;

}



/* Return a pointer to the data buffer.  */

hw/scsi.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct SCSIDeviceInfo { 
    void (*free_req)(SCSIRequest *req);

    int32_t (*send_command)(SCSIRequest *req, uint8_t *buf);

    void (*read_data)(SCSIRequest *req);

    int (*write_data)(SCSIRequest *req);

    void (*write_data)(SCSIRequest *req);

    void (*cancel_io)(SCSIRequest *req);

    uint8_t *(*get_buf)(SCSIRequest *req);

    int (*get_sense)(SCSIRequest *req, uint8_t *buf, int len);