From patchwork Mon Feb 29 01:46:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 8448331 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5F87FC0553 for ; Mon, 29 Feb 2016 01:50:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C17AC20221 for ; Mon, 29 Feb 2016 01:50:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17FA720220 for ; Mon, 29 Feb 2016 01:50:16 +0000 (UTC) Received: from localhost ([::1]:33428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaCyV-000750-Iv for patchwork-qemu-devel@patchwork.kernel.org; Sun, 28 Feb 2016 20:50:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaCwM-0003mF-CU for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:48:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaCwL-0004zE-3d for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:48:02 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:41463) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaCwK-0004wJ-3Q for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:48:01 -0500 Received: from 172.24.1.51 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.51]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DCC42980; Mon, 29 Feb 2016 09:47:45 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.235.1; Mon, 29 Feb 2016 09:47:35 +0800 From: zhanghailiang To: Date: Mon, 29 Feb 2016 09:46:06 +0800 Message-ID: <1456710366-10980-3-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1456710366-10980-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1456710366-10980-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.24.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090202.56D3A342.0072, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: f9f42e408ddc6e202da333d48be56cf6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Cc: jasowang@redhat.com, zhanghailiang , hongyang.yang@easystack.cn Subject: [Qemu-devel] [PATCH v2 2/2] filter-buffer: Add status_changed callback processing 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP While the status of filter-buffer changing from 'on' to 'off', it need to release all the buffered packets, and delete the related timer, while switch from 'off' to 'on', it need to resume the release packets timer. Signed-off-by: zhanghailiang Cc: Jason Wang Cc: Yang Hongyang --- v2: - New patch --- net/filter-buffer.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/net/filter-buffer.c b/net/filter-buffer.c index 12ad2e3..ed3f19e 100644 --- a/net/filter-buffer.c +++ b/net/filter-buffer.c @@ -124,6 +124,24 @@ static void filter_buffer_setup(NetFilterState *nf, Error **errp) } } +static void filter_buffer_status_changed(NetFilterState *nf, Error **errp) +{ + FilterBufferState *s = FILTER_BUFFER(nf); + + if (!strcmp(nf->status, "off")) { + if (s->interval) { + timer_del(&s->release_timer); + } + filter_buffer_flush(nf); + } else { + if (s->interval) { + timer_init_us(&s->release_timer, QEMU_CLOCK_VIRTUAL, + filter_buffer_release_timer, nf); + timer_mod(&s->release_timer, + qemu_clock_get_us(QEMU_CLOCK_VIRTUAL) + s->interval); + } + } +} static void filter_buffer_class_init(ObjectClass *oc, void *data) { NetFilterClass *nfc = NETFILTER_CLASS(oc); @@ -131,6 +149,7 @@ static void filter_buffer_class_init(ObjectClass *oc, void *data) nfc->setup = filter_buffer_setup; nfc->cleanup = filter_buffer_cleanup; nfc->receive_iov = filter_buffer_receive_iov; + nfc->status_changed = filter_buffer_status_changed; } static void filter_buffer_get_interval(Object *obj, Visitor *v,