From patchwork Mon Feb 22 02:40:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 585952 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 AC251140C15 for ; Mon, 22 Feb 2016 13:55:08 +1100 (AEDT) Received: from localhost ([::1]:46195 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgeQ-0005q5-Pg for incoming@patchwork.ozlabs.org; Sun, 21 Feb 2016 21:55:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgRp-0002DF-EP for qemu-devel@nongnu.org; Sun, 21 Feb 2016 21:42:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXgRo-0007Zn-7Z for qemu-devel@nongnu.org; Sun, 21 Feb 2016 21:42:05 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:14079) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgRn-0007Yv-FI for qemu-devel@nongnu.org; Sun, 21 Feb 2016 21:42:04 -0500 Received: from 172.24.1.50 (EHLO szxeml428-hub.china.huawei.com) ([172.24.1.50]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BWL15805; Mon, 22 Feb 2016 10:41:49 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml428-hub.china.huawei.com (10.82.67.183) with Microsoft SMTP Server id 14.3.235.1; Mon, 22 Feb 2016 10:41:39 +0800 From: zhanghailiang To: Date: Mon, 22 Feb 2016 10:40:27 +0800 Message-ID: <1456108832-24212-34-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1456108832-24212-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1456108832-24212-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.0A090203.56CA756F.0015, 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: 9a5c09970e3e153d376fc06541fc4b24 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: xiecl.fnst@cn.fujitsu.com, lizhijian@cn.fujitsu.com, quintela@redhat.com, armbru@redhat.com, Jason Wang , yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, zhanghailiang , arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com, zhangchen.fnst@cn.fujitsu.com, hongyang.yang@easystack.cn Subject: [Qemu-devel] [PATCH COLO-Frame v15 33/38] net: Add notifier/callback for netdev init 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 We can register some callback for this notifier, this will be used by COLO to register a callback which will add each netdev a buffer filter. Signed-off-by: zhanghailiang Cc: Jason Wang Cc: Yang Hongyang --- v14: - New patch --- include/net/net.h | 4 ++++ net/net.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/include/net/net.h b/include/net/net.h index 73e4c46..f6f0194 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -176,6 +176,10 @@ struct NICInfo { int nvectors; }; +typedef struct netdev_init_entry NetdevInitEntry; +typedef void NetdevInitHandler(const char *netdev_id, void *opaque); +NetdevInitEntry *netdev_init_add_handler(NetdevInitHandler *cb, void *opaque); + extern int nb_nics; extern NICInfo nd_table[MAX_NICS]; extern int default_net; diff --git a/net/net.c b/net/net.c index aebf753..bdd3e7b 100644 --- a/net/net.c +++ b/net/net.c @@ -55,6 +55,14 @@ static VMChangeStateEntry *net_change_state_entry; static QTAILQ_HEAD(, NetClientState) net_clients; +struct netdev_init_entry { + NetdevInitHandler *cb; + void *opaque; + QLIST_ENTRY(netdev_init_entry) entries; +}; + +static QLIST_HEAD(netdev_init_head, netdev_init_entry)netdev_init_head; + const char *host_net_devices[] = { "tap", "socket", @@ -953,6 +961,26 @@ static int net_init_nic(const NetClientOptions *opts, const char *name, return idx; } +NetdevInitEntry *netdev_init_add_handler(NetdevInitHandler *cb, void *opaque) +{ + NetdevInitEntry *e; + + e = g_malloc0(sizeof(*e)); + + e->cb = cb; + e->opaque = opaque; + QLIST_INSERT_HEAD(&netdev_init_head, e, entries); + return e; +} + +static void netdev_init_notify(const char *netdev_id) +{ + NetdevInitEntry *e, *next; + + QLIST_FOREACH_SAFE(e, &netdev_init_head, entries, next) { + e->cb(netdev_id, e->opaque); + } +} static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND__MAX])( const NetClientOptions *opts, @@ -1039,6 +1067,11 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) } return -1; } + if (is_netdev) { + const Netdev *netdev = object; + + netdev_init_notify(netdev->id); + } return 0; }