From nobody Mon Feb 9 09:34:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520755146690768.082965572424; Sat, 10 Mar 2018 23:59:06 -0800 (PST) Received: from localhost ([::1]:53413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euvse-00005O-0R for importer@patchew.org; Sun, 11 Mar 2018 03:58:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euvge-0006eY-1H for qemu-devel@nongnu.org; Sun, 11 Mar 2018 03:46:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euvgd-0000zu-1d for qemu-devel@nongnu.org; Sun, 11 Mar 2018 03:46:32 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:41507) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euvgc-0000zU-RU for qemu-devel@nongnu.org; Sun, 11 Mar 2018 03:46:30 -0400 Received: by mail-pg0-x244.google.com with SMTP id w17so1178332pgq.8 for ; Sat, 10 Mar 2018 23:46:30 -0800 (PST) Received: from localhost.localdomain (120.236.201.35.bc.googleusercontent.com. [35.201.236.120]) by smtp.gmail.com with ESMTPSA id t16sm10917037pfm.69.2018.03.10.23.46.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Mar 2018 23:46:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xGJfOtyitB72l6WyXk30MaHec1wKPM9nbCkyT8g5f/A=; b=nXjK6FH9wZ+8rh19dfxk0YUj2HOxCHKZX+KjtYj2n66/HVUUGE1DseSCDXJm3tzSGn V20GcG2dtrbx/+8zLb7Wy+3R+jQYKhBdmGoeaDVP7eTMhm4V3A/45Wd83ZScxyp2ZHeI k0Gkhfv3sV36ZxBXC04zuPybPfVqakwJYe/0aLZV6F4eupOSXSEm9Ctru7G0lMQ/8omj t+o+K53ZVZuuJ7lPX8kNkDTG9GplaiNThohM6tMgFRliODihKWCYeNRY6F0EbMCndrti CnEiZIK0LsUODMmh1NZC5yEQz7Ea+IumwF9K5AglJtiBTCxN+kXIR02X7Q8tbyCS2Vnh 4CrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xGJfOtyitB72l6WyXk30MaHec1wKPM9nbCkyT8g5f/A=; b=SfWVCGo9AIZ7JrgIqylfzINd+ji9EIW7mVOki5SLhtVqbAAIcyrvDXqRUJPS3DYT+e htGQDwiGnA4WbNvFZqJsTRFIyNtrDoZDdIt/w00kEpfRAdwHahNzFoVbtEZDFTfH75sa xoomxj7cSRuCn9c23g6cnTGGLRawqvvLNC3TwciQmWLSIS6X4viu9pQlAq0CBgb7Lr7j /53SMgoyPSBqvqKf1/dU80qBXGs3CVZlnqrdjmbKp0TPMylKGRWm8VSk6uFrZhuBnxsQ yMuXW3Ff+r4CZPoVEMblZ/YLG8EBV6WtEaxz0VUMlNXq6xGadUI4ScN8qPjb0ODQw5FP puhw== X-Gm-Message-State: AElRT7GBn0NNnwM1jjZphKXhMBpakbGUb0/AEcN+bCZdrz+CR+3DC1s0 Lql1fS6APoNoS3OcaRnC52e/Uzob X-Google-Smtp-Source: AG47ELtGarmukX2qjjzj/IfjsPyx69AZM9K8p7bCJxKI5ToZLm7UoClDSSMSosHnQPP+1dmwRWaX8w== X-Received: by 10.101.93.82 with SMTP id e18mr3357882pgt.371.1520754389642; Sat, 10 Mar 2018 23:46:29 -0800 (PST) From: Zhang Chen To: qemu-devel@nongnu.org Date: Sun, 11 Mar 2018 15:45:11 +0800 Message-Id: <1520754314-5969-16-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520754314-5969-1-git-send-email-zhangckid@gmail.com> References: <1520754314-5969-1-git-send-email-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::244 Subject: [Qemu-devel] [PATCH V6 14/17] filter: Add handle_event method for NetFilterClass 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: zhanghailiang , Li Zhijian , Juan Quintela , Jason Wang , "Dr . David Alan Gilbert" , Markus Armbruster , Zhang Chen , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Filter needs to process the event of checkpoint/failover or other event passed by COLO frame. Signed-off-by: zhanghailiang --- include/net/filter.h | 5 +++++ net/filter.c | 17 +++++++++++++++++ net/net.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/include/net/filter.h b/include/net/filter.h index 435acd6..49da666 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -38,6 +38,8 @@ typedef ssize_t (FilterReceiveIOV)(NetFilterState *nc, =20 typedef void (FilterStatusChanged) (NetFilterState *nf, Error **errp); =20 +typedef void (FilterHandleEvent) (NetFilterState *nf, int event, Error **e= rrp); + typedef struct NetFilterClass { ObjectClass parent_class; =20 @@ -45,6 +47,7 @@ typedef struct NetFilterClass { FilterSetup *setup; FilterCleanup *cleanup; FilterStatusChanged *status_changed; + FilterHandleEvent *handle_event; /* mandatory */ FilterReceiveIOV *receive_iov; } NetFilterClass; @@ -77,4 +80,6 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sende= r, int iovcnt, void *opaque); =20 +void colo_notify_filters_event(int event, Error **errp); + #endif /* QEMU_NET_FILTER_H */ diff --git a/net/filter.c b/net/filter.c index 2fd7d7d..0f17eba 100644 --- a/net/filter.c +++ b/net/filter.c @@ -17,6 +17,8 @@ #include "net/vhost_net.h" #include "qom/object_interfaces.h" #include "qemu/iov.h" +#include "net/colo.h" +#include "migration/colo.h" =20 static inline bool qemu_can_skip_netfilter(NetFilterState *nf) { @@ -245,11 +247,26 @@ static void netfilter_finalize(Object *obj) g_free(nf->netdev_id); } =20 +static void dummy_handle_event(NetFilterState *nf, int event, Error **errp) +{ + switch (event) { + case COLO_EVENT_CHECKPOINT: + break; + case COLO_EVENT_FAILOVER: + object_property_set_str(OBJECT(nf), "off", "status", errp); + break; + default: + break; + } +} + static void netfilter_class_init(ObjectClass *oc, void *data) { UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); + NetFilterClass *nfc =3D NETFILTER_CLASS(oc); =20 ucc->complete =3D netfilter_complete; + nfc->handle_event =3D dummy_handle_event; } =20 static const TypeInfo netfilter_info =3D { diff --git a/net/net.c b/net/net.c index 5222e45..5bdbd6a 100644 --- a/net/net.c +++ b/net/net.c @@ -1336,6 +1336,34 @@ void hmp_info_network(Monitor *mon, const QDict *qdi= ct) } } =20 +void colo_notify_filters_event(int event, Error **errp) +{ + NetClientState *nc, *peer; + NetClientDriver type; + NetFilterState *nf; + NetFilterClass *nfc =3D NULL; + Error *local_err =3D NULL; + + QTAILQ_FOREACH(nc, &net_clients, next) { + peer =3D nc->peer; + type =3D nc->info->type; + if (!peer || type !=3D NET_CLIENT_DRIVER_TAP) { + continue; + } + QTAILQ_FOREACH(nf, &nc->filters, next) { + nfc =3D NETFILTER_GET_CLASS(OBJECT(nf)); + if (!nfc->handle_event) { + continue; + } + nfc->handle_event(nf, event, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + } + } +} + void qmp_set_link(const char *name, bool up, Error **errp) { NetClientState *ncs[MAX_QUEUE_NUM]; --=20 2.7.4