Commit 75344fa4 authored by Fam Zheng's avatar Fam Zheng Committed by Kevin Wolf
Browse files

virtio-blk: Pass req to virtio_blk_handle_scsi_req 



In preparation for calling blk_aio_ioctl. Also make the function static
as no other files need it.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent c6441452

hw/block/virtio-blk.c

+5 −4
Original line number Diff line number Diff line
@@ -127,12 +127,13 @@ static VirtIOBlockReq *virtio_blk_get_request(VirtIOBlock *s) 
    return req;

}



int virtio_blk_handle_scsi_req(VirtIOBlock *blk,

                               VirtQueueElement *elem)

static int virtio_blk_handle_scsi_req(VirtIOBlockReq *req)

{

    int status = VIRTIO_BLK_S_OK;

    struct virtio_scsi_inhdr *scsi = NULL;

    VirtIODevice *vdev = VIRTIO_DEVICE(blk);

    VirtIODevice *vdev = VIRTIO_DEVICE(req->dev);

    VirtQueueElement *elem = &req->elem;

    VirtIOBlock *blk = req->dev;



#ifdef __linux__

    int i;
@@ -252,7 +253,7 @@ static void virtio_blk_handle_scsi(VirtIOBlockReq *req) 
{

    int status;



    status = virtio_blk_handle_scsi_req(req->dev, &req->elem);

    status = virtio_blk_handle_scsi_req(req);

    virtio_blk_req_complete(req, status);

    virtio_blk_free_request(req);

}

include/hw/virtio/virtio-blk.h

+0 −3
Original line number Diff line number Diff line
@@ -153,9 +153,6 @@ VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s); 


void virtio_blk_free_request(VirtIOBlockReq *req);



int virtio_blk_handle_scsi_req(VirtIOBlock *blk,

                               VirtQueueElement *elem);



void virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb);



void virtio_submit_multiwrite(BlockBackend *blk, MultiReqBuffer *mrb);