From patchwork Wed Aug 3 12:26:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 9261207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A316A60865 for ; Wed, 3 Aug 2016 13:02:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9414428581 for ; Wed, 3 Aug 2016 13:02:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 834EB28580; Wed, 3 Aug 2016 13:02:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id AB8AF28580 for ; Wed, 3 Aug 2016 13:02:30 +0000 (UTC) Received: from localhost ([::1]:34352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUvob-0004Dm-PU for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 Aug 2016 09:02:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUvGQ-0000oM-Um for qemu-devel@nongnu.org; Wed, 03 Aug 2016 08:27:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUvGM-0006dM-N3 for qemu-devel@nongnu.org; Wed, 03 Aug 2016 08:27:10 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:30681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUvGL-0006cD-Rb for qemu-devel@nongnu.org; Wed, 03 Aug 2016 08:27:06 -0400 Received: from 172.24.1.36 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.36]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DOT30338; Wed, 03 Aug 2016 20:26:56 +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; Wed, 3 Aug 2016 20:26:46 +0800 From: zhanghailiang To: Date: Wed, 3 Aug 2016 20:26:09 +0800 Message-ID: <1470227172-13704-32-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1470227172-13704-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1470227172-13704-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.57A1E311.0144, 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: 36cef31cbc8a85b6f9617672b9145f0c X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 58.251.152.64 Subject: [Qemu-devel] [PATCH COLO-Frame v18 31/34] net: Add notifier/callback for netdev init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xiecl.fnst@cn.fujitsu.com, lizhijian@cn.fujitsu.com, quintela@redhat.com, Jason Wang , eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, amit.shah@redhat.com, zhangchen.fnst@cn.fujitsu.com, Yang Hongyang , zhanghailiang Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- v17: - Rename netdev_init_add_notifier() to netdev_register_init_notifier() v16: - Simplify the codes by using some helpers in QEMU v14: - New patch --- include/net/net.h | 3 +++ net/net.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/net/net.h b/include/net/net.h index e8d9e9e..b67fe20 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -8,6 +8,7 @@ #include "net/queue.h" #include "migration/vmstate.h" #include "qapi-types.h" +#include "qemu/notify.h" #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X" #define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \ @@ -195,6 +196,8 @@ struct NICInfo { int nvectors; }; +void netdev_register_init_notifier(Notifier *notify); + extern int nb_nics; extern NICInfo nd_table[MAX_NICS]; extern const char *host_net_devices[]; diff --git a/net/net.c b/net/net.c index c124b11..4e8268d 100644 --- a/net/net.c +++ b/net/net.c @@ -56,6 +56,9 @@ static VMChangeStateEntry *net_change_state_entry; static QTAILQ_HEAD(, NetClientState) net_clients; +static NotifierList netdev_init_notifiers = + NOTIFIER_LIST_INITIALIZER(netdev_init_notifiers); + const char *host_net_devices[] = { "tap", "socket", @@ -929,6 +932,10 @@ static int net_init_nic(const Netdev *netdev, const char *name, return idx; } +void netdev_register_init_notifier(Notifier *notify) +{ + notifier_list_add(&netdev_init_notifiers, notify); +} static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])( const Netdev *netdev, @@ -1056,6 +1063,11 @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp) } return -1; } + if (is_netdev) { + const Netdev *netdev = object; + + notifier_list_notify(&netdev_init_notifiers, netdev->id); + } return 0; }