From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtaHh-0008VP-MH for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:01:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtaHd-0002xS-0q for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:01:53 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:11608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtaHb-0002wM-Au for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:01:48 -0500 From: zhanghailiang Date: Tue, 3 Nov 2015 19:56:51 +0800 Message-ID: <1446551816-15768-34-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1446551816-15768-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1446551816-15768-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v10 33/38] netfilter: Introduce an API to delete the timer of all buffer-filters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com, Jason Wang , yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com, zhanghailiang Signed-off-by: zhanghailiang Cc: Jason Wang --- v10: new patch --- include/net/filter.h | 1 + net/filter-buffer.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/include/net/filter.h b/include/net/filter.h index 5a09607..4499d60 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -74,5 +74,6 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sender, int iovcnt, void *opaque); void filter_buffer_release_all(void); +void filter_buffer_del_all_timers(void); #endif /* QEMU_NET_FILTER_H */ diff --git a/net/filter-buffer.c b/net/filter-buffer.c index b344901..5f0ea70 100644 --- a/net/filter-buffer.c +++ b/net/filter-buffer.c @@ -178,6 +178,23 @@ void filter_buffer_release_all(void) qemu_foreach_netfilter(filter_buffer_release_packets, NULL, NULL); } +static void filter_buffer_del_timer(NetFilterState *nf, void *opaque, + Error **errp) +{ + if (!strcmp(object_get_typename(OBJECT(nf)), TYPE_FILTER_BUFFER)) { + FilterBufferState *s = FILTER_BUFFER(nf); + + if (s->interval) { + timer_del(&s->release_timer); + } + } +} + +void filter_buffer_del_all_timers(void) +{ + qemu_foreach_netfilter(filter_buffer_del_timer, NULL, NULL); +} + static void filter_buffer_init(Object *obj) { object_property_add(obj, "interval", "int", -- 1.8.3.1