Commit 033cb565 authored by Max Reitz's avatar Max Reitz
Browse files

block: Remove BDS close notifier 



It is unused now, so we can remove it.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 741cc431

block.c

+0 −8
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ BlockDriverState *bdrv_new(void) 
    for (i = 0; i < BLOCK_OP_TYPE_MAX; i++) {

        QLIST_INIT(&bs->op_blockers[i]);

    }

    notifier_list_init(&bs->close_notifiers);

    notifier_with_return_list_init(&bs->before_write_notifiers);

    qemu_co_queue_init(&bs->throttled_reqs[0]);

    qemu_co_queue_init(&bs->throttled_reqs[1]);
@@ -269,11 +268,6 @@ BlockDriverState *bdrv_new(void) 
    return bs;

}



void bdrv_add_close_notifier(BlockDriverState *bs, Notifier *notify)

{

    notifier_list_add(&bs->close_notifiers, notify);

}



BlockDriver *bdrv_find_format(const char *format_name)

{

    BlockDriver *drv1;
@@ -2157,8 +2151,6 @@ void bdrv_close(BlockDriverState *bs) 
    bdrv_flush(bs);

    bdrv_drain(bs); /* in case flush left pending I/O */



    notifier_list_notify(&bs->close_notifiers, bs);



    bdrv_release_named_dirty_bitmaps(bs);

    assert(QLIST_EMPTY(&bs->dirty_bitmaps));

block/block-backend.c

+0 −7
Original line number Diff line number Diff line
@@ -1146,13 +1146,6 @@ void blk_add_insert_bs_notifier(BlockBackend *blk, Notifier *notify) 
    notifier_list_add(&blk->insert_bs_notifiers, notify);

}



void blk_add_close_notifier(BlockBackend *blk, Notifier *notify)

{

    if (blk->bs) {

        bdrv_add_close_notifier(blk->bs, notify);

    }

}



void blk_io_plug(BlockBackend *blk)

{

    if (blk->bs) {

include/block/block.h

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, 
void bdrv_reopen_commit(BDRVReopenState *reopen_state);

void bdrv_reopen_abort(BDRVReopenState *reopen_state);

void bdrv_close(BlockDriverState *bs);

void bdrv_add_close_notifier(BlockDriverState *bs, Notifier *notify);

int bdrv_read(BlockDriverState *bs, int64_t sector_num,

              uint8_t *buf, int nb_sectors);

int bdrv_read_unthrottled(BlockDriverState *bs, int64_t sector_num,

include/block/block_int.h

+0 −2
Original line number Diff line number Diff line
@@ -403,8 +403,6 @@ struct BlockDriverState { 
    BdrvChild *backing;

    BdrvChild *file;



    NotifierList close_notifiers;



    /* Callback before write request is processed */

    NotifierWithReturnList before_write_notifiers;

include/sysemu/block-backend.h

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ void blk_remove_aio_context_notifier(BlockBackend *blk, 
                                     void *opaque);

void blk_add_remove_bs_notifier(BlockBackend *blk, Notifier *notify);

void blk_add_insert_bs_notifier(BlockBackend *blk, Notifier *notify);

void blk_add_close_notifier(BlockBackend *blk, Notifier *notify);

void blk_io_plug(BlockBackend *blk);

void blk_io_unplug(BlockBackend *blk);

BlockAcctStats *blk_get_stats(BlockBackend *blk);