From nobody Sun Feb 8 19:55:05 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 14886334586581011.2962371998624; Sat, 4 Mar 2017 05:17:38 -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 v24DDPXm056910; Sat, 4 Mar 2017 08:13:26 -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 v24DCgn3029285 for ; Sat, 4 Mar 2017 08:12:42 -0500 Received: from localhost.localdomain.com (ovpn-116-78.phx2.redhat.com [10.3.116.78]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v24DCe05009154 for ; Sat, 4 Mar 2017 08:12:42 -0500 From: John Ferlan To: libvir-list@redhat.com Date: Sat, 4 Mar 2017 08:12:34 -0500 Message-Id: <20170304131235.2057-4-jferlan@redhat.com> In-Reply-To: <20170304131235.2057-1-jferlan@redhat.com> References: <20170304131235.2057-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] conf: Use consistent function name prefixes for virinterfaceobj 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 "virInterfaceObj" as a prefix for any external API in virinterfaceobj Signed-off-by: John Ferlan --- src/conf/virinterfaceobj.c | 24 ++++++++++++------------ src/conf/virinterfaceobj.h | 18 +++++++++--------- src/libvirt_private.syms | 8 ++++---- src/test/test_driver.c | 25 ++++++++++--------------- 4 files changed, 35 insertions(+), 40 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 70f9001..3af972b 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -64,9 +64,9 @@ virInterfaceObjFree(virInterfaceObjPtr iface) =20 /* virInterfaceObjList manipulation */ int -virInterfaceFindByMACString(virInterfaceObjListPtr interfaces, - const char *mac, - virInterfaceObjPtr *matches, int maxmatches) +virInterfaceObjFindByMACString(virInterfaceObjListPtr interfaces, + const char *mac, + virInterfaceObjPtr *matches, int maxmatches) { size_t i; unsigned int matchct =3D 0; @@ -91,8 +91,8 @@ virInterfaceFindByMACString(virInterfaceObjListPtr interf= aces, =20 =20 virInterfaceObjPtr -virInterfaceFindByName(virInterfaceObjListPtr interfaces, - const char *name) +virInterfaceObjFindByName(virInterfaceObjListPtr interfaces, + const char *name) { size_t i; =20 @@ -148,9 +148,9 @@ virInterfaceObjListClone(virInterfaceObjListPtr src, } =20 VIR_FREE(xml); - if ((iface =3D virInterfaceAssignDef(dest, backup)) =3D=3D NULL) + if ((iface =3D virInterfaceObjAssignDef(dest, backup)) =3D=3D NULL) goto cleanup; - virInterfaceObjUnlock(iface); /* was locked by virInterfaceAssignD= ef */ + virInterfaceObjUnlock(iface); /* locked by virInterfaceObjAssignDe= f */ } =20 ret =3D cnt; @@ -162,12 +162,12 @@ virInterfaceObjListClone(virInterfaceObjListPtr src, =20 =20 virInterfaceObjPtr -virInterfaceAssignDef(virInterfaceObjListPtr interfaces, - virInterfaceDefPtr def) +virInterfaceObjAssignDef(virInterfaceObjListPtr interfaces, + virInterfaceDefPtr def) { virInterfaceObjPtr iface; =20 - if ((iface =3D virInterfaceFindByName(interfaces, def->name))) { + if ((iface =3D virInterfaceObjFindByName(interfaces, def->name))) { virInterfaceDefFree(iface->def); iface->def =3D def; =20 @@ -197,8 +197,8 @@ virInterfaceAssignDef(virInterfaceObjListPtr interfaces, =20 =20 void -virInterfaceRemove(virInterfaceObjListPtr interfaces, - virInterfaceObjPtr iface) +virInterfaceObjRemove(virInterfaceObjListPtr interfaces, + virInterfaceObjPtr iface) { size_t i; =20 diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 51d7c75..dfda748 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -44,11 +44,11 @@ virInterfaceObjIsActive(const virInterfaceObj *iface) return iface->active; } =20 -int virInterfaceFindByMACString(virInterfaceObjListPtr interfaces, - const char *mac, - virInterfaceObjPtr *matches, int maxmatche= s); -virInterfaceObjPtr virInterfaceFindByName(virInterfaceObjListPtr interface= s, - const char *name); +int virInterfaceObjFindByMACString(virInterfaceObjListPtr interfaces, + const char *mac, + virInterfaceObjPtr *matches, int maxmat= ches); +virInterfaceObjPtr virInterfaceObjFindByName(virInterfaceObjListPtr interf= aces, + const char *name); =20 =20 void virInterfaceObjFree(virInterfaceObjPtr iface); @@ -57,10 +57,10 @@ int virInterfaceObjListClone(virInterfaceObjListPtr src, virInterfaceObjListPtr dest); =20 =20 -virInterfaceObjPtr virInterfaceAssignDef(virInterfaceObjListPtr interfaces, - virInterfaceDefPtr def); -void virInterfaceRemove(virInterfaceObjListPtr interfaces, - virInterfaceObjPtr iface); +virInterfaceObjPtr virInterfaceObjAssignDef(virInterfaceObjListPtr interfa= ces, + virInterfaceDefPtr def); +void virInterfaceObjRemove(virInterfaceObjListPtr interfaces, + virInterfaceObjPtr iface); =20 void virInterfaceObjLock(virInterfaceObjPtr obj); void virInterfaceObjUnlock(virInterfaceObjPtr obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b39e17d..2349ce0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -941,14 +941,14 @@ virDomainObjListRename; =20 =20 # conf/virinterfaceobj.h -virInterfaceAssignDef; -virInterfaceFindByMACString; -virInterfaceFindByName; +virInterfaceObjAssignDef; +virInterfaceObjFindByMACString; +virInterfaceObjFindByName; virInterfaceObjListClone; virInterfaceObjListFree; virInterfaceObjLock; +virInterfaceObjRemove; virInterfaceObjUnlock; -virInterfaceRemove; =20 =20 # conf/virnodedeviceobj.h diff --git a/src/test/test_driver.c b/src/test/test_driver.c index e72a91f..2fd9776 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1019,7 +1019,7 @@ testParseInterfaces(testDriverPtr privconn, if (!def) goto error; =20 - if (!(obj =3D virInterfaceAssignDef(&privconn->ifaces, def))) { + if (!(obj =3D virInterfaceObjAssignDef(&privconn->ifaces, def))) { virInterfaceDefFree(def); goto error; } @@ -3738,7 +3738,7 @@ static virInterfacePtr testInterfaceLookupByName(virC= onnectPtr conn, virInterfacePtr ret =3D NULL; =20 testDriverLock(privconn); - iface =3D virInterfaceFindByName(&privconn->ifaces, name); + iface =3D virInterfaceObjFindByName(&privconn->ifaces, name); testDriverUnlock(privconn); =20 if (iface =3D=3D NULL) { @@ -3763,7 +3763,7 @@ static virInterfacePtr testInterfaceLookupByMACString= (virConnectPtr conn, virInterfacePtr ret =3D NULL; =20 testDriverLock(privconn); - ifacect =3D virInterfaceFindByMACString(&privconn->ifaces, mac, &iface= , 1); + ifacect =3D virInterfaceObjFindByMACString(&privconn->ifaces, mac, &if= ace, 1); testDriverUnlock(privconn); =20 if (ifacect =3D=3D 0) { @@ -3791,7 +3791,7 @@ static int testInterfaceIsActive(virInterfacePtr ifac= e) int ret =3D -1; =20 testDriverLock(privconn); - obj =3D virInterfaceFindByName(&privconn->ifaces, iface->name); + obj =3D virInterfaceObjFindByName(&privconn->ifaces, iface->name); testDriverUnlock(privconn); if (!obj) { virReportError(VIR_ERR_NO_INTERFACE, NULL); @@ -3902,8 +3902,7 @@ static char *testInterfaceGetXMLDesc(virInterfacePtr = iface, virCheckFlags(0, NULL); =20 testDriverLock(privconn); - privinterface =3D virInterfaceFindByName(&privconn->ifaces, - iface->name); + privinterface =3D virInterfaceObjFindByName(&privconn->ifaces, iface->= name); testDriverUnlock(privconn); =20 if (privinterface =3D=3D NULL) { @@ -3934,7 +3933,7 @@ static virInterfacePtr testInterfaceDefineXML(virConn= ectPtr conn, const char *xm if ((def =3D virInterfaceDefParseString(xmlStr)) =3D=3D NULL) goto cleanup; =20 - if ((iface =3D virInterfaceAssignDef(&privconn->ifaces, def)) =3D=3D N= ULL) + if ((iface =3D virInterfaceObjAssignDef(&privconn->ifaces, def)) =3D= =3D NULL) goto cleanup; def =3D NULL; =20 @@ -3955,16 +3954,14 @@ static int testInterfaceUndefine(virInterfacePtr if= ace) int ret =3D -1; =20 testDriverLock(privconn); - privinterface =3D virInterfaceFindByName(&privconn->ifaces, - iface->name); + privinterface =3D virInterfaceObjFindByName(&privconn->ifaces, iface->= name); =20 if (privinterface =3D=3D NULL) { virReportError(VIR_ERR_NO_INTERFACE, NULL); goto cleanup; } =20 - virInterfaceRemove(&privconn->ifaces, - privinterface); + virInterfaceObjRemove(&privconn->ifaces, privinterface); ret =3D 0; =20 cleanup: @@ -3982,8 +3979,7 @@ static int testInterfaceCreate(virInterfacePtr iface, virCheckFlags(0, -1); =20 testDriverLock(privconn); - privinterface =3D virInterfaceFindByName(&privconn->ifaces, - iface->name); + privinterface =3D virInterfaceObjFindByName(&privconn->ifaces, iface->= name); =20 if (privinterface =3D=3D NULL) { virReportError(VIR_ERR_NO_INTERFACE, NULL); @@ -4015,8 +4011,7 @@ static int testInterfaceDestroy(virInterfacePtr iface, virCheckFlags(0, -1); =20 testDriverLock(privconn); - privinterface =3D virInterfaceFindByName(&privconn->ifaces, - iface->name); + privinterface =3D virInterfaceObjFindByName(&privconn->ifaces, iface->= name); =20 if (privinterface =3D=3D NULL) { virReportError(VIR_ERR_NO_INTERFACE, NULL); --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list