Commit 83c98d7b authored by Fam Zheng's avatar Fam Zheng Committed by Kevin Wolf
Browse files

block: Drop BlockDriver.bdrv_ioctl 



Now the callback is not used any more, drop the field along with all
implementations in block drivers, which are iscsi and raw.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-id: 1447064214-29930-8-git-send-email-famz@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 5c5ae76a

block/iscsi.c

+0 −33
Original line number Diff line number Diff line
@@ -898,38 +898,6 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, 
    return &acb->common;

}



static void ioctl_cb(void *opaque, int status)

{

    int *p_status = opaque;

    *p_status = status;

}



static int iscsi_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)

{

    IscsiLun *iscsilun = bs->opaque;

    int status;



    switch (req) {

    case SG_GET_VERSION_NUM:

        *(int *)buf = 30000;

        break;

    case SG_GET_SCSI_ID:

        ((struct sg_scsi_id *)buf)->scsi_type = iscsilun->type;

        break;

    case SG_IO:

        status = -EINPROGRESS;

        iscsi_aio_ioctl(bs, req, buf, ioctl_cb, &status);



        while (status == -EINPROGRESS) {

            aio_poll(iscsilun->aio_context, true);

        }



        return 0;

    default:

        return -1;

    }

    return 0;

}

#endif



static int64_t
@@ -1860,7 +1828,6 @@ static BlockDriver bdrv_iscsi = { 
    .bdrv_co_flush_to_disk = iscsi_co_flush,



#ifdef __linux__

    .bdrv_ioctl       = iscsi_ioctl,

    .bdrv_aio_ioctl   = iscsi_aio_ioctl,

#endif

block/raw-posix.c

+0 −8
Original line number Diff line number Diff line
@@ -2175,12 +2175,6 @@ static int hdev_open(BlockDriverState *bs, QDict *options, int flags, 
}



#if defined(__linux__)

static int hdev_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)

{

    BDRVRawState *s = bs->opaque;



    return ioctl(s->fd, req, buf);

}



static BlockAIOCB *hdev_aio_ioctl(BlockDriverState *bs,

        unsigned long int req, void *buf,
@@ -2338,7 +2332,6 @@ static BlockDriver bdrv_host_device = { 


    /* generic scsi device */

#ifdef __linux__

    .bdrv_ioctl         = hdev_ioctl,

    .bdrv_aio_ioctl     = hdev_aio_ioctl,

#endif

};
@@ -2471,7 +2464,6 @@ static BlockDriver bdrv_host_cdrom = { 
    .bdrv_lock_medium   = cdrom_lock_medium,



    /* generic scsi device */

    .bdrv_ioctl         = hdev_ioctl,

    .bdrv_aio_ioctl     = hdev_aio_ioctl,

};

#endif /* __linux__ */

block/raw_bsd.c

+0 −6
Original line number Diff line number Diff line
@@ -169,11 +169,6 @@ static void raw_lock_medium(BlockDriverState *bs, bool locked) 
    bdrv_lock_medium(bs->file->bs, locked);

}



static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)

{

    return bdrv_ioctl(bs->file->bs, req, buf);

}



static BlockAIOCB *raw_aio_ioctl(BlockDriverState *bs,

                                 unsigned long int req, void *buf,

                                 BlockCompletionFunc *cb,
@@ -262,7 +257,6 @@ BlockDriver bdrv_raw = { 
    .bdrv_media_changed   = &raw_media_changed,

    .bdrv_eject           = &raw_eject,

    .bdrv_lock_medium     = &raw_lock_medium,

    .bdrv_ioctl           = &raw_ioctl,

    .bdrv_aio_ioctl       = &raw_aio_ioctl,

    .create_opts          = &raw_create_opts,

    .bdrv_has_zero_init   = &raw_has_zero_init

include/block/block_int.h

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ struct BlockDriver { 
    void (*bdrv_lock_medium)(BlockDriverState *bs, bool locked);



    /* to control generic scsi devices */

    int (*bdrv_ioctl)(BlockDriverState *bs, unsigned long int req, void *buf);

    BlockAIOCB *(*bdrv_aio_ioctl)(BlockDriverState *bs,

        unsigned long int req, void *buf,

        BlockCompletionFunc *cb, void *opaque);