From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtbBE-0008Pw-6v for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:59:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtbBA-0001yr-UL for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:59:16 -0500 Received: from mr213139.mail.yeah.net ([223.252.213.139]:41224) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtbBA-0001rA-0j for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:59:12 -0500 References: <1446551816-15768-1-git-send-email-zhang.zhanghailiang@huawei.com> <1446551816-15768-37-git-send-email-zhang.zhanghailiang@huawei.com> From: Yang Hongyang Message-ID: <5638AF8A.7040804@easystack.cn> Date: Tue, 3 Nov 2015 20:58:50 +0800 MIME-Version: 1.0 In-Reply-To: <1446551816-15768-37-git-send-email-zhang.zhanghailiang@huawei.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH COLO-Frame v10 36/38] netfilter: Introduce an API to delete all the automatically added netfilters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: zhanghailiang , 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 On 2015=E5=B9=B411=E6=9C=8803=E6=97=A5 19:56, zhanghailiang wrote: > We add a new property 'auto' for netfilter to distinguish if netfilter = is > added by user or automatically added. > > Signed-off-by: zhanghailiang > Cc: Jason Wang > --- > v10: new patch > --- > include/net/filter.h | 2 ++ > net/filter-buffer.c | 17 +++++++++++++++++ > net/filter.c | 15 +++++++++++++++ > 3 files changed, 34 insertions(+) > > diff --git a/include/net/filter.h b/include/net/filter.h > index b0954ba..46d3ef9 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 auto_add; > char info_str[256]; > QTAILQ_ENTRY(NetFilterState) next; > }; > @@ -76,5 +77,6 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *s= ender, > void filter_buffer_release_all(void); > void filter_buffer_del_all_timers(void); > void qemu_auto_add_filter_buffer(NetFilterDirection direction, Error = **errp); > +void qemu_auto_del_filter_buffer(Error **errp); > > #endif /* QEMU_NET_FILTER_H */ > diff --git a/net/filter-buffer.c b/net/filter-buffer.c > index 0dc1efb..ea4481c 100644 > --- a/net/filter-buffer.c > +++ b/net/filter-buffer.c > @@ -19,6 +19,7 @@ > #include "qapi/qmp-output-visitor.h" > #include "qapi/qmp-input-visitor.h" > #include "monitor/monitor.h" > +#include "qmp-commands.h" > > > #define TYPE_FILTER_BUFFER "filter-buffer" > @@ -269,6 +270,22 @@ void qemu_auto_add_filter_buffer(NetFilterDirectio= n direction, Error **errp) > g_free(queue); > } > > +static void netdev_del_filter_buffer(NetFilterState *nf, void *opaque, > + Error **errp) > +{ > + if (!strcmp(object_get_typename(OBJECT(nf)), TYPE_FILTER_BUFFER) &= & > + nf->auto_add) { > + char *id =3D object_get_canonical_path_component(OBJECT(nf)); > + > + qmp_object_del(id, errp); > + } > +} > + > +void qemu_auto_del_filter_buffer(Error **errp) > +{ > + qemu_foreach_netfilter(netdev_del_filter_buffer, NULL, errp); > +} > + > static void filter_buffer_init(Object *obj) > { > object_property_add(obj, "interval", "int", > diff --git a/net/filter.c b/net/filter.c > index 326f2b5..dcbcb80 100644 > --- a/net/filter.c > +++ b/net/filter.c > @@ -117,6 +117,18 @@ static void netfilter_set_direction(Object *obj, i= nt direction, Error **errp) > nf->direction =3D direction; > } > > +static bool netfilter_get_auto_flag(Object *obj, Error **errp) > +{ > + NetFilterState *nf =3D NETFILTER(obj); > + return nf->auto_add; > +} > + > +static void netfilter_set_auto_flag(Object *obj, bool flag, Error **er= rp) > +{ > + NetFilterState *nf =3D NETFILTER(obj); > + nf->auto_add =3D flag; > +} > + This chunk of code should be in previous patch. > static void netfilter_init(Object *obj) > { > object_property_add_str(obj, "netdev", > @@ -126,6 +138,9 @@ static void netfilter_init(Object *obj) > NetFilterDirection_lookup, > netfilter_get_direction, netfilter_set_d= irection, > NULL); > + object_property_add_bool(obj, "auto", > + netfilter_get_auto_flag, netfilter_set_au= to_flag, > + NULL); > } Ditto. > > static void netfilter_complete(UserCreatable *uc, Error **errp) > --=20 Thanks, Yang