Commit a83cfd12 authored by Fam Zheng's avatar Fam Zheng Committed by Paolo Bonzini
Browse files

scsi: Drop SCSIReqOps.cancel_io 



The only two implementations are identical to each other, with nothing specific
to device: they only call bdrv_aio_cancel with the SCSIRequest.aiocb.

Let's move it to scsi-bus.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3df9caf8

hw/scsi/scsi-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -1727,8 +1727,8 @@ void scsi_req_cancel(SCSIRequest *req) 
    scsi_req_ref(req);

    scsi_req_dequeue(req);

    req->io_canceled = true;

    if (req->ops->cancel_io) {

        req->ops->cancel_io(req);

    if (req->aiocb) {

        bdrv_aio_cancel(req->aiocb);

    }

    if (req->bus->info->cancel) {

        req->bus->info->cancel(req);

hw/scsi/scsi-disk.c

+0 −14
Original line number Diff line number Diff line
@@ -105,18 +105,6 @@ static void scsi_check_condition(SCSIDiskReq *r, SCSISense sense) 
    scsi_req_complete(&r->req, CHECK_CONDITION);

}



/* Cancel a pending data transfer.  */

static void scsi_cancel_io(SCSIRequest *req)

{

    SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);



    DPRINTF("Cancel tag=0x%x\n", req->tag);

    if (r->req.aiocb) {

        bdrv_aio_cancel(r->req.aiocb);

    }

    r->req.aiocb = NULL;

}



static uint32_t scsi_init_iovec(SCSIDiskReq *r, size_t size)

{

    SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
@@ -2325,7 +2313,6 @@ static const SCSIReqOps scsi_disk_emulate_reqops = { 
    .send_command = scsi_disk_emulate_command,

    .read_data    = scsi_disk_emulate_read_data,

    .write_data   = scsi_disk_emulate_write_data,

    .cancel_io    = scsi_cancel_io,

    .get_buf      = scsi_get_buf,

};
@@ -2335,7 +2322,6 @@ static const SCSIReqOps scsi_disk_dma_reqops = { 
    .send_command = scsi_disk_dma_command,

    .read_data    = scsi_read_data,

    .write_data   = scsi_write_data,

    .cancel_io    = scsi_cancel_io,

    .get_buf      = scsi_get_buf,

    .load_request = scsi_disk_load_request,

    .save_request = scsi_disk_save_request,

hw/scsi/scsi-generic.c

+0 −13
Original line number Diff line number Diff line
@@ -140,18 +140,6 @@ done: 
    scsi_req_unref(&r->req);

}



/* Cancel a pending data transfer.  */

static void scsi_cancel_io(SCSIRequest *req)

{

    SCSIGenericReq *r = DO_UPCAST(SCSIGenericReq, req, req);



    DPRINTF("Cancel tag=0x%x\n", req->tag);

    if (r->req.aiocb) {

        bdrv_aio_cancel(r->req.aiocb);

    }

    r->req.aiocb = NULL;

}



static int execute_command(BlockDriverState *bdrv,

                           SCSIGenericReq *r, int direction,

			   BlockDriverCompletionFunc *complete)
@@ -458,7 +446,6 @@ const SCSIReqOps scsi_generic_req_ops = { 
    .send_command = scsi_send_command,

    .read_data    = scsi_read_data,

    .write_data   = scsi_write_data,

    .cancel_io    = scsi_cancel_io,

    .get_buf      = scsi_get_buf,

    .load_request = scsi_generic_load_request,

    .save_request = scsi_generic_save_request,

include/hw/scsi/scsi.h

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ struct SCSIReqOps { 
    int32_t (*send_command)(SCSIRequest *req, uint8_t *buf);

    void (*read_data)(SCSIRequest *req);

    void (*write_data)(SCSIRequest *req);

    void (*cancel_io)(SCSIRequest *req);

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



    void (*save_request)(QEMUFile *f, SCSIRequest *req);