Commit a46fc9c9 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block: Prepare remaining BB functions for NULL BDS 



There are several BlockBackend functions which, in theory, cannot fail.
This patch makes them cope with the BlockDriverState pointer being NULL
by making them fall back to some default action like ignoring the value
in setters and returning the default in getters.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent c09ba36c

block/block-backend.c

+56 −16
Original line number Diff line number Diff line
@@ -677,8 +677,12 @@ int64_t blk_getlength(BlockBackend *blk) 


void blk_get_geometry(BlockBackend *blk, uint64_t *nb_sectors_ptr)

{

    if (!blk->bs) {

        *nb_sectors_ptr = 0;

    } else {

        bdrv_get_geometry(blk->bs, nb_sectors_ptr);

    }

}



int64_t blk_nb_sectors(BlockBackend *blk)

{
@@ -813,8 +817,10 @@ int blk_flush_all(void) 


void blk_drain(BlockBackend *blk)

{

    if (blk->bs) {

        bdrv_drain(blk->bs);

    }

}



void blk_drain_all(void)

{
@@ -909,6 +915,10 @@ int blk_is_read_only(BlockBackend *blk) 


int blk_is_sg(BlockBackend *blk)

{

    if (!blk->bs) {

        return 0;

    }



    return bdrv_is_sg(blk->bs);

}
@@ -956,13 +966,17 @@ bool blk_is_available(BlockBackend *blk) 


void blk_lock_medium(BlockBackend *blk, bool locked)

{

    if (blk->bs) {

        bdrv_lock_medium(blk->bs, locked);

    }

}



void blk_eject(BlockBackend *blk, bool eject_flag)

{

    if (blk->bs) {

        bdrv_eject(blk->bs, eject_flag);

    }

}



int blk_get_flags(BlockBackend *blk)

{
@@ -975,7 +989,11 @@ int blk_get_flags(BlockBackend *blk) 


int blk_get_max_transfer_length(BlockBackend *blk)

{

    if (blk->bs) {

        return blk->bs->bl.max_transfer_length;

    } else {

        return 0;

    }

}



void blk_set_guest_block_size(BlockBackend *blk, int align)
@@ -990,23 +1008,33 @@ void *blk_blockalign(BlockBackend *blk, size_t size) 


bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op, Error **errp)

{

    if (!blk->bs) {

        return false;

    }



    return bdrv_op_is_blocked(blk->bs, op, errp);

}



void blk_op_unblock(BlockBackend *blk, BlockOpType op, Error *reason)

{

    if (blk->bs) {

        bdrv_op_unblock(blk->bs, op, reason);

    }

}



void blk_op_block_all(BlockBackend *blk, Error *reason)

{

    if (blk->bs) {

        bdrv_op_block_all(blk->bs, reason);

    }

}



void blk_op_unblock_all(BlockBackend *blk, Error *reason)

{

    if (blk->bs) {

        bdrv_op_unblock_all(blk->bs, reason);

    }

}



AioContext *blk_get_aio_context(BlockBackend *blk)

{
@@ -1025,16 +1053,20 @@ static AioContext *blk_aiocb_get_aio_context(BlockAIOCB *acb) 


void blk_set_aio_context(BlockBackend *blk, AioContext *new_context)

{

    if (blk->bs) {

        bdrv_set_aio_context(blk->bs, new_context);

    }

}



void blk_add_aio_context_notifier(BlockBackend *blk,

        void (*attached_aio_context)(AioContext *new_context, void *opaque),

        void (*detach_aio_context)(void *opaque), void *opaque)

{

    if (blk->bs) {

        bdrv_add_aio_context_notifier(blk->bs, attached_aio_context,

                                      detach_aio_context, opaque);

    }

}



void blk_remove_aio_context_notifier(BlockBackend *blk,

                                     void (*attached_aio_context)(AioContext *,
@@ -1042,24 +1074,32 @@ void blk_remove_aio_context_notifier(BlockBackend *blk, 
                                     void (*detach_aio_context)(void *),

                                     void *opaque)

{

    if (blk->bs) {

        bdrv_remove_aio_context_notifier(blk->bs, attached_aio_context,

                                         detach_aio_context, opaque);

    }

}



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

        bdrv_io_plug(blk->bs);

    }

}



void blk_io_unplug(BlockBackend *blk)

{

    if (blk->bs) {

        bdrv_io_unplug(blk->bs);

    }

}



BlockAcctStats *blk_get_stats(BlockBackend *blk)

{