From patchwork Mon Nov 9 22:39:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 542027 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AA3DA1409F8 for ; Tue, 10 Nov 2015 09:49:05 +1100 (AEDT) Received: from localhost ([::1]:56165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvvFH-0001os-HZ for incoming@patchwork.ozlabs.org; Mon, 09 Nov 2015 17:49:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvv6t-0003cK-Lb for qemu-devel@nongnu.org; Mon, 09 Nov 2015 17:40:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zvv6s-00050q-Hl for qemu-devel@nongnu.org; Mon, 09 Nov 2015 17:40:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvv6q-00050I-3S; Mon, 09 Nov 2015 17:40:20 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id C4C3DA2C16; Mon, 9 Nov 2015 22:40:19 +0000 (UTC) Received: from localhost (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tA9MeHYp029996 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 9 Nov 2015 17:40:18 -0500 From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 9 Nov 2015 23:39:24 +0100 Message-Id: <1447108773-6836-16-git-send-email-mreitz@redhat.com> In-Reply-To: <1447108773-6836-1-git-send-email-mreitz@redhat.com> References: <1447108773-6836-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Alberto Garcia , John Snow , Markus Armbruster , qemu-devel@nongnu.org, Stefan Hajnoczi , Paolo Bonzini , Max Reitz Subject: [Qemu-devel] [PATCH v7 15/24] block: Remove BDS close notifier X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It is unused now, so we can remove it. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf --- block.c | 7 ------- block/block-backend.c | 7 ------- include/block/block.h | 1 - include/block/block_int.h | 2 -- include/sysemu/block-backend.h | 1 - 5 files changed, 18 deletions(-) diff --git a/block.c b/block.c index 94c0ecf..4ee3b01 100644 --- a/block.c +++ b/block.c @@ -258,7 +258,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]); @@ -268,11 +267,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; @@ -1916,7 +1910,6 @@ void bdrv_close(BlockDriverState *bs) bdrv_drain(bs); /* complete I/O */ bdrv_flush(bs); bdrv_drain(bs); /* in case flush left pending I/O */ - notifier_list_notify(&bs->close_notifiers, bs); bdrv_release_all_dirty_bitmaps(bs); diff --git a/block/block-backend.c b/block/block-backend.c index 8f74a54..a00486c 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1125,13 +1125,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) { diff --git a/include/block/block.h b/include/block/block.h index 610db92..8d9a049 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -223,7 +223,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, diff --git a/include/block/block_int.h b/include/block/block_int.h index 603145a..617994d 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -382,8 +382,6 @@ struct BlockDriverState { BdrvChild *backing; BdrvChild *file; - NotifierList close_notifiers; - /* Callback before write request is processed */ NotifierWithReturnList before_write_notifiers; diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 632cdc0..abb52be 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -164,7 +164,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);