From nobody Mon Mar 30 03:42:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.37 as permitted sender) client-ip=209.132.183.37; envelope-from=libvir-list-bounces@redhat.com; helo=mx5-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.37 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx5-phx2.redhat.com (mx5-phx2.redhat.com [209.132.183.37]) by mx.zohomail.com with SMTPS id 1488818382573723.8135313068595; Mon, 6 Mar 2017 08:39:42 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx5-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v26GaYYK023339; Mon, 6 Mar 2017 11:36:34 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v26GaJ1f019702 for ; Mon, 6 Mar 2017 11:36:19 -0500 Received: from localhost.localdomain.com (ovpn-117-9.phx2.redhat.com [10.3.117.9]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v26GaGoW010285 for ; Mon, 6 Mar 2017 11:36:19 -0500 From: John Ferlan To: libvir-list@redhat.com Date: Mon, 6 Mar 2017 11:36:12 -0500 Message-Id: <20170306163612.6514-7-jferlan@redhat.com> In-Reply-To: <20170306163612.6514-1-jferlan@redhat.com> References: <20170306163612.6514-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/6] conf: Use consistent function name prefixes for virnwfilterobj 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use "virNWFilterObj" as a prefix for any external API in virnwfilterobj Signed-off-by: John Ferlan --- src/conf/virnwfilterobj.c | 34 +++++++++++++++++----------------- src/conf/virnwfilterobj.h | 6 +++--- src/libvirt_private.syms | 4 ++-- src/nwfilter/nwfilter_driver.c | 8 +++----- 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 0d81912..7e13afb 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -117,9 +117,9 @@ virNWFilterObjFindByName(virNWFilterObjListPtr nwfilter= s, =20 =20 static int -_virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilters, - virNWFilterDefPtr def, - const char *filtername) +_virNWFilterObjDefLoopDetect(virNWFilterObjListPtr nwfilters, + virNWFilterDefPtr def, + const char *filtername) { int rc =3D 0; size_t i; @@ -141,8 +141,8 @@ _virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilte= rs, obj =3D virNWFilterObjFindByName(nwfilters, entry->include->filterref); if (obj) { - rc =3D _virNWFilterDefLoopDetect(nwfilters, - obj->def, filtername); + rc =3D _virNWFilterObjDefLoopDetect(nwfilters, + obj->def, filtername); =20 virNWFilterObjUnlock(obj); if (rc < 0) @@ -156,7 +156,7 @@ _virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilte= rs, =20 =20 /* - * virNWFilterDefLoopDetect: + * virNWFilterObjDefLoopDetect: * @nwfilters : the nwfilters to search * @def : the filter definition that may add a loop and is to be tested * @@ -166,15 +166,15 @@ _virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfil= ters, * Returns 0 in case no loop was detected, -1 otherwise. */ static int -virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilters, - virNWFilterDefPtr def) +virNWFilterObjDefLoopDetect(virNWFilterObjListPtr nwfilters, + virNWFilterDefPtr def) { - return _virNWFilterDefLoopDetect(nwfilters, def, def->name); + return _virNWFilterObjDefLoopDetect(nwfilters, def, def->name); } =20 =20 int -virNWFilterTestUnassignDef(virNWFilterObjPtr nwfilter) +virNWFilterObjTestUnassignDef(virNWFilterObjPtr nwfilter) { int rc =3D 0; =20 @@ -252,7 +252,7 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, } } =20 - if (virNWFilterDefLoopDetect(nwfilters, def) < 0) { + if (virNWFilterObjDefLoopDetect(nwfilters, def) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("filter would introduce a loop")); return NULL; @@ -306,9 +306,9 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, =20 =20 static virNWFilterObjPtr -virNWFilterLoadConfig(virNWFilterObjListPtr nwfilters, - const char *configDir, - const char *name) +virNWFilterObjLoadConfig(virNWFilterObjListPtr nwfilters, + const char *configDir, + const char *name) { virNWFilterDefPtr def =3D NULL; virNWFilterObjPtr nwfilter; @@ -347,8 +347,8 @@ virNWFilterLoadConfig(virNWFilterObjListPtr nwfilters, =20 =20 int -virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters, - const char *configDir) +virNWFilterObjLoadAllConfigs(virNWFilterObjListPtr nwfilters, + const char *configDir) { DIR *dir; struct dirent *entry; @@ -364,7 +364,7 @@ virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilte= rs, if (!virFileStripSuffix(entry->d_name, ".xml")) continue; =20 - nwfilter =3D virNWFilterLoadConfig(nwfilters, configDir, entry->d_= name); + nwfilter =3D virNWFilterObjLoadConfig(nwfilters, configDir, entry-= >d_name); if (nwfilter) virNWFilterObjUnlock(nwfilter); } diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index 593f426..1d80455 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -79,11 +79,11 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, virNWFilterDefPtr def); =20 int -virNWFilterTestUnassignDef(virNWFilterObjPtr nwfilter); +virNWFilterObjTestUnassignDef(virNWFilterObjPtr nwfilter); =20 int -virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters, - const char *configDir); +virNWFilterObjLoadAllConfigs(virNWFilterObjListPtr nwfilters, + const char *configDir); =20 void virNWFilterObjLock(virNWFilterObjPtr obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3c4b943..e0caa07 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -957,15 +957,15 @@ virNodeDeviceObjUnlock; =20 =20 # conf/virnwfilterobj.h -virNWFilterLoadAllConfigs; virNWFilterObjAssignDef; virNWFilterObjFindByName; virNWFilterObjFindByUUID; virNWFilterObjListFree; +virNWFilterObjLoadAllConfigs; virNWFilterObjLock; virNWFilterObjRemove; +virNWFilterObjTestUnassignDef; virNWFilterObjUnlock; -virNWFilterTestUnassignDef; =20 =20 # conf/virsecretobj.h diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 6ce2bfd..4ea216a 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -237,8 +237,7 @@ nwfilterStateInitialize(bool privileged, =20 VIR_FREE(base); =20 - if (virNWFilterLoadAllConfigs(&driver->nwfilters, - driver->configDir) < 0) + if (virNWFilterObjLoadAllConfigs(&driver->nwfilters, driver->configDir= ) < 0) goto error; =20 nwfilterDriverUnlock(); @@ -290,8 +289,7 @@ nwfilterStateReload(void) virNWFilterWriteLockFilterUpdates(); virNWFilterCallbackDriversLock(); =20 - virNWFilterLoadAllConfigs(&driver->nwfilters, - driver->configDir); + virNWFilterObjLoadAllConfigs(&driver->nwfilters, driver->configDir); =20 virNWFilterCallbackDriversUnlock(); virNWFilterUnlockFilterUpdates(); @@ -595,7 +593,7 @@ nwfilterUndefine(virNWFilterPtr obj) if (virNWFilterUndefineEnsureACL(obj->conn, nwfilter->def) < 0) goto cleanup; =20 - if (virNWFilterTestUnassignDef(nwfilter) < 0) { + if (virNWFilterObjTestUnassignDef(nwfilter) < 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("nwfilter is in use")); --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list