From nobody Mon Feb 9 08:10:22 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599167224; cv=none; d=zohomail.com; s=zohoarc; b=id5OHxB7ZzRmKLjKk1IX8CT0cydaGgEj+KuGtoT7aiwF+A5WwWeszFtqTPCV0e7wfrC9aXLfcix/P9EA6y8LcmhbNbGIf9DjIE+QpWeapwD0LDSjH+dUN1LmPbm+um0oVQE/NcnfQ5I6Plosq0ncfcGNKS+2E6CoOz6kn5EHnaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599167224; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/K3E4AQB9Wyo8p40roP4rTMm1MIlAuiE6H9hhreumsE=; b=EEwaSGyaVHzuJcZQqudRs25/kFt94539GnmJFmAKqB9wPIvVANqwrngKKdKoPL4MJ8GhdM3w+qxPQM6rFRFx8aoMa4RpQc8HG4KwsfX13do6w+gm8mxEbXGa4FR54qsiQ13KBJ99E2qG/H0A0umHnkLY7MII7jxBfkABEjkLRrE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599167224899192.07870099527668; Thu, 3 Sep 2020 14:07:04 -0700 (PDT) Received: from localhost ([::1]:59978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDwRk-0005F2-4t for importer@patchew.org; Thu, 03 Sep 2020 17:07:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDwEd-00017t-Kp for qemu-devel@nongnu.org; Thu, 03 Sep 2020 16:53:33 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54375 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDwEZ-0006bo-Jl for qemu-devel@nongnu.org; Thu, 03 Sep 2020 16:53:30 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-35-9m83jws1O8auwL5RJqi3ng-1; Thu, 03 Sep 2020 16:53:22 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A70A610BBEC7; Thu, 3 Sep 2020 20:53:21 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76CA46716C; Thu, 3 Sep 2020 20:53:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599166405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/K3E4AQB9Wyo8p40roP4rTMm1MIlAuiE6H9hhreumsE=; b=bAxU2ucEkivyyjBEjpxl2I1HHFZPWbpKIAi8V4zcakLnA6sF8LBi1hgqYzF0uv+Ivxymjq jY7L05q9GtLkclGxd6r91MaTjJiBHgUtKXP+XnA4617HWl7lDtFHFgpw/0lNLLyCG2oXaS jjgjqPxopTdarbqkhg3gddT9qabsdec= X-MC-Unique: 9m83jws1O8auwL5RJqi3ng-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 21/27] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER Date: Thu, 3 Sep 2020 16:52:41 -0400 Message-Id: <20200903205247.1667472-22-ehabkost@redhat.com> In-Reply-To: <20200903205247.1667472-1-ehabkost@redhat.com> References: <20200903205247.1667472-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 00:24:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost Reviewed-by: Zhang Chen Message-Id: <20200902224311.1321159-41-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- net/filter-rewriter.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 113e293207..44f6021dd8 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -25,7 +25,7 @@ =20 #define TYPE_FILTER_REWRITER "filter-rewriter" typedef struct RewriterState RewriterState; -DECLARE_INSTANCE_CHECKER(RewriterState, FILTER_COLO_REWRITER, +DECLARE_INSTANCE_CHECKER(RewriterState, FILTER_REWRITER, TYPE_FILTER_REWRITER) =20 #define FAILOVER_MODE_ON true @@ -47,7 +47,7 @@ static void filter_rewriter_failover_mode(RewriterState *= s) =20 static void filter_rewriter_flush(NetFilterState *nf) { - RewriterState *s =3D FILTER_COLO_REWRITER(nf); + RewriterState *s =3D FILTER_REWRITER(nf); =20 if (!qemu_net_queue_flush(s->incoming_queue)) { /* Unable to empty the queue, purge remaining packets */ @@ -252,7 +252,7 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState= *nf, int iovcnt, NetPacketSent *sent_cb) { - RewriterState *s =3D FILTER_COLO_REWRITER(nf); + RewriterState *s =3D FILTER_REWRITER(nf); Connection *conn; ConnectionKey key; Packet *pkt; @@ -350,7 +350,7 @@ static gboolean offset_is_nonzero(gpointer key, static void colo_rewriter_handle_event(NetFilterState *nf, int event, Error **errp) { - RewriterState *rs =3D FILTER_COLO_REWRITER(nf); + RewriterState *rs =3D FILTER_REWRITER(nf); =20 switch (event) { case COLO_EVENT_CHECKPOINT: @@ -370,7 +370,7 @@ static void colo_rewriter_handle_event(NetFilterState *= nf, int event, =20 static void colo_rewriter_cleanup(NetFilterState *nf) { - RewriterState *s =3D FILTER_COLO_REWRITER(nf); + RewriterState *s =3D FILTER_REWRITER(nf); =20 /* flush packets */ if (s->incoming_queue) { @@ -381,7 +381,7 @@ static void colo_rewriter_cleanup(NetFilterState *nf) =20 static void colo_rewriter_setup(NetFilterState *nf, Error **errp) { - RewriterState *s =3D FILTER_COLO_REWRITER(nf); + RewriterState *s =3D FILTER_REWRITER(nf); =20 s->connection_track_table =3D g_hash_table_new_full(connection_key_has= h, connection_key_equal, @@ -392,7 +392,7 @@ static void colo_rewriter_setup(NetFilterState *nf, Err= or **errp) =20 static bool filter_rewriter_get_vnet_hdr(Object *obj, Error **errp) { - RewriterState *s =3D FILTER_COLO_REWRITER(obj); + RewriterState *s =3D FILTER_REWRITER(obj); =20 return s->vnet_hdr; } @@ -401,14 +401,14 @@ static void filter_rewriter_set_vnet_hdr(Object *obj, bool value, Error **errp) { - RewriterState *s =3D FILTER_COLO_REWRITER(obj); + RewriterState *s =3D FILTER_REWRITER(obj); =20 s->vnet_hdr =3D value; } =20 static void filter_rewriter_init(Object *obj) { - RewriterState *s =3D FILTER_COLO_REWRITER(obj); + RewriterState *s =3D FILTER_REWRITER(obj); =20 s->vnet_hdr =3D false; s->failover_mode =3D FAILOVER_MODE_OFF; --=20 2.26.2