From nobody Thu Jul 3 21:07:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528979606720752.1376600974658; Thu, 14 Jun 2018 05:33:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B9AB94E90E; Thu, 14 Jun 2018 12:33:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7EC56201562F; Thu, 14 Jun 2018 12:33:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2E8F141F54; Thu, 14 Jun 2018 12:33:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5ECXBrn008659 for ; Thu, 14 Jun 2018 08:33:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id B25AF2024CBD; Thu, 14 Jun 2018 12:33:11 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 246C82024CBB; Thu, 14 Jun 2018 12:33:11 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 14 Jun 2018 13:32:50 +0100 Message-Id: <20180614123309.15659-2-berrange@redhat.com> In-Reply-To: <20180614123309.15659-1-berrange@redhat.com> References: <20180614123309.15659-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 01/20] conf: change virNWFilterBindingPtr to virNWFilterBindingDefPtr X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 14 Jun 2018 12:33:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 We are going to want to expose the NWFilter binding concept in the public API, so the virNWFilterBindingPtr type needs to be used there. Our internal type will shortly gain an XML representation, so rename it to virNWFilterBindingDefPtr which follows our normal conventions. Reviewed-by: John Ferlan Signed-off-by: Daniel P. Berrang=C3=A9 --- src/conf/nwfilter_conf.c | 24 ++++++++++++------------ src/conf/nwfilter_conf.h | 12 ++++++------ src/libvirt_private.syms | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 452daa214a..6422f6b8ea 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -3268,25 +3268,25 @@ virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDe= fPtr rule) =20 =20 void -virNWFilterBindingFree(virNWFilterBindingPtr binding) +virNWFilterBindingDefFree(virNWFilterBindingDefPtr def) { - if (!binding) + if (!def) return; =20 - VIR_FREE(binding->ownername); - VIR_FREE(binding->portdevname); - VIR_FREE(binding->linkdevname); - VIR_FREE(binding->filter); - virHashFree(binding->filterparams); + VIR_FREE(def->ownername); + VIR_FREE(def->portdevname); + VIR_FREE(def->linkdevname); + VIR_FREE(def->filter); + virHashFree(def->filterparams); =20 - VIR_FREE(binding); + VIR_FREE(def); } =20 =20 -virNWFilterBindingPtr -virNWFilterBindingCopy(virNWFilterBindingPtr src) +virNWFilterBindingDefPtr +virNWFilterBindingDefCopy(virNWFilterBindingDefPtr src) { - virNWFilterBindingPtr ret; + virNWFilterBindingDefPtr ret; =20 if (VIR_ALLOC(ret) < 0) return NULL; @@ -3316,6 +3316,6 @@ virNWFilterBindingCopy(virNWFilterBindingPtr src) return ret; =20 error: - virNWFilterBindingFree(ret); + virNWFilterBindingDefFree(ret); return NULL; } diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 6fcbba4bd5..c72171f2f2 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -545,10 +545,10 @@ struct _virNWFilterDef { virNWFilterEntryPtr *filterEntries; }; =20 -typedef struct virNWFilterBinding virNWFilterBinding; -typedef virNWFilterBinding *virNWFilterBindingPtr; +typedef struct _virNWFilterBindingDef virNWFilterBindingDef; +typedef virNWFilterBindingDef *virNWFilterBindingDefPtr; =20 -struct virNWFilterBinding { +struct _virNWFilterBindingDef { char *ownername; unsigned char owneruuid[VIR_UUID_BUFLEN]; char *portdevname; @@ -664,9 +664,9 @@ bool virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule); =20 void -virNWFilterBindingFree(virNWFilterBindingPtr binding); -virNWFilterBindingPtr -virNWFilterBindingCopy(virNWFilterBindingPtr src); +virNWFilterBindingDefFree(virNWFilterBindingDefPtr binding); +virNWFilterBindingDefPtr +virNWFilterBindingDefCopy(virNWFilterBindingDefPtr src); =20 VIR_ENUM_DECL(virNWFilterRuleAction); VIR_ENUM_DECL(virNWFilterRuleDirection); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ea24f2847c..a8e9469286 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -788,8 +788,8 @@ virDomainNumatuneSpecifiedMaxNode; =20 =20 # conf/nwfilter_conf.h -virNWFilterBindingCopy; -virNWFilterBindingFree; +virNWFilterBindingDefCopy; +virNWFilterBindingDefFree; virNWFilterCallbackDriversLock; virNWFilterCallbackDriversUnlock; virNWFilterChainSuffixTypeToString; --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list