From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvzbT-0004s9-QJ for qemu-devel@nongnu.org; Mon, 09 Nov 2015 22:28:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvzbS-0006QF-NW for qemu-devel@nongnu.org; Mon, 09 Nov 2015 22:28:15 -0500 From: Max Reitz Date: Tue, 10 Nov 2015 04:27:47 +0100 Message-Id: <1447126069-6185-7-git-send-email-mreitz@redhat.com> In-Reply-To: <1447126069-6185-1-git-send-email-mreitz@redhat.com> References: <1447126069-6185-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 6/8] blockdev: Remove blk_hide_on_behalf_of_hmp_drive_del() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi , Max Reitz This function first removed the BlockBackend from the blk_backends list and cleared its name so it would no longer be found by blk_name(); since blk_next() now iterates through monitor_block_backends (which the BB is removed from in hmp_drive_del()), this is no longer necessary. Second, bdrv_make_anon() was called on the BDS. This was intended for cases where the BDS was owned by that BB alone; in which case the BDS will no longer exist at this point thanks to the blk_remove_bs() in hmp_drive_del(). Therefore, this function does nothing useful anymore. Remove it. Signed-off-by: Max Reitz --- block/block-backend.c | 25 ++----------------------- blockdev.c | 1 - include/sysemu/block-backend.h | 2 -- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index e35d84f..609a045 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -68,7 +68,7 @@ static const AIOCBInfo block_backend_aiocb_info = { static void drive_info_del(DriveInfo *dinfo); -/* All the BlockBackends (except for hidden ones) */ +/* All the BlockBackends */ static QTAILQ_HEAD(, BlockBackend) blk_backends = QTAILQ_HEAD_INITIALIZER(blk_backends); @@ -180,10 +180,7 @@ static void blk_delete(BlockBackend *blk) g_free(blk->root_state.throttle_group); throttle_group_unref(blk->root_state.throttle_state); } - /* Avoid double-remove after blk_hide_on_behalf_of_hmp_drive_del() */ - if (blk->name[0]) { - QTAILQ_REMOVE(&blk_backends, blk, link); - } + QTAILQ_REMOVE(&blk_backends, blk, link); g_free(blk->name); drive_info_del(blk->legacy_dinfo); g_free(blk); @@ -403,24 +400,6 @@ BlockBackend *blk_by_legacy_dinfo(DriveInfo *dinfo) } /* - * Hide @blk. - * @blk must not have been hidden already. - * Make attached BlockDriverState, if any, anonymous. - * Once hidden, @blk is invisible to all functions that don't receive - * it as argument. For example, blk_by_name() won't return it. - * Strictly for use by do_drive_del(). - * TODO get rid of it! - */ -void blk_hide_on_behalf_of_hmp_drive_del(BlockBackend *blk) -{ - QTAILQ_REMOVE(&blk_backends, blk, link); - blk->name[0] = 0; - if (blk->bs) { - bdrv_make_anon(blk->bs); - } -} - -/* * Disassociates the currently associated BlockDriverState from @blk. */ void blk_remove_bs(BlockBackend *blk) diff --git a/blockdev.c b/blockdev.c index f5dde19..934b9d8 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2539,7 +2539,6 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict) * then we can just get rid of the block driver state right here. */ if (blk_get_attached_dev(blk)) { - blk_hide_on_behalf_of_hmp_drive_del(blk); /* Further I/O must not pause the guest */ blk_set_on_error(blk, BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT); diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 9a3d8db..5208c08 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -81,8 +81,6 @@ BlockDriverState *blk_bs(BlockBackend *blk); void blk_remove_bs(BlockBackend *blk); void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs); -void blk_hide_on_behalf_of_hmp_drive_del(BlockBackend *blk); - void blk_iostatus_enable(BlockBackend *blk); bool blk_iostatus_is_enabled(const BlockBackend *blk); BlockDeviceIoStatus blk_iostatus(const BlockBackend *blk); -- 2.6.2