From patchwork Mon Feb 1 12:01:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 8178421 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 BF6BABEEE5 for ; Mon, 1 Feb 2016 12:02:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75374203B7 for ; Mon, 1 Feb 2016 12:02:36 +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 A1C20203C1 for ; Mon, 1 Feb 2016 12:02:33 +0000 (UTC) Received: from localhost ([::1]:51966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQDBh-0004Qp-5M for patchwork-qemu-devel@patchwork.kernel.org; Mon, 01 Feb 2016 07:02:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQDBW-0004Pd-6h for qemu-devel@nongnu.org; Mon, 01 Feb 2016 07:02:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQDBS-0003FK-J8 for qemu-devel@nongnu.org; Mon, 01 Feb 2016 07:02:22 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:33010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQDBS-0003EZ-13 for qemu-devel@nongnu.org; Mon, 01 Feb 2016 07:02:18 -0500 Received: from 172.24.1.48 (EHLO szxeml432-hub.china.huawei.com) ([172.24.1.48]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BVN64181; Mon, 01 Feb 2016 20:02:00 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.235.1; Mon, 1 Feb 2016 20:01:49 +0800 From: zhanghailiang To: Date: Mon, 1 Feb 2016 20:01:15 +0800 Message-ID: <1454328077-18820-3-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1454328077-18820-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1454328077-18820-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.0A020206.56AF493D.00EE, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 5e4dd4cc00c99ff1d4f3ce4f89e16abe X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Cc: zhanghailiang , zhangchen.fnst@cn.fujitsu.com, jasowang@redhat.com, dgilbert@redhat.com, hongyang.yang@easystack.cn Subject: [Qemu-devel] [PATCH v3 2/4] net/filter: Introduce a helper to add a filter to the netdev 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 We add a new helper function netdev_add_filter(), this function can help adding a filter object to a netdev. Besides, we add a is_default member for struct NetFilterState to indicate whether the filter is default or not. Signed-off-by: zhanghailiang --- v3: - Use object_new_with_props() instead of object_create() (Daniel's suggestion) v2: - Re-implement netdev_add_filter() by re-using object_create() (Jason's suggestion) --- include/net/filter.h | 7 +++++++ net/filter.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/include/net/filter.h b/include/net/filter.h index af3c53c..661abef 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -55,6 +55,7 @@ struct NetFilterState { char *netdev_id; NetClientState *netdev; NetFilterDirection direction; + bool is_default; bool enabled; QTAILQ_ENTRY(NetFilterState) next; }; @@ -74,4 +75,10 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sender, int iovcnt, void *opaque); +void netdev_add_filter(const char *netdev_id, + const char *filter_type, + const char *filter_id, + bool is_default, + Error **errp); + #endif /* QEMU_NET_FILTER_H */ diff --git a/net/filter.c b/net/filter.c index d08a2be..7f9df57 100644 --- a/net/filter.c +++ b/net/filter.c @@ -214,6 +214,40 @@ static void netfilter_complete(UserCreatable *uc, Error **errp) QTAILQ_INSERT_TAIL(&nf->netdev->filters, nf, next); } +void netdev_add_filter(const char *netdev_id, + const char *filter_type, + const char *filter_id, + bool is_default, + Error **errp) +{ + NetClientState *nc = qemu_find_netdev(netdev_id); + Object *filter; + NetFilterState *nf; + Error *local_err = NULL; + + /* FIXME: Not support multiple queues */ + if (!nc || nc->queue_index > 1) { + return; + } + /* Not support vhost-net */ + if (get_vhost_net(nc)) { + return; + } + filter = object_new_with_props(filter_type, + object_get_objects_root(), + filter_id, + &local_err, + "netdev", netdev_id, + "status", is_default ? "disable" : "enable", + NULL); + if (local_err) { + error_propagate(errp, local_err); + return; + } + nf = NETFILTER(filter); + nf->is_default = is_default; +} + static void netfilter_finalize(Object *obj) { NetFilterState *nf = NETFILTER(obj);