From nobody Sat Feb 7 10:50:24 2026 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1492041875453933.6833114527183; Wed, 12 Apr 2017 17:04:35 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id E608081F07; Thu, 13 Apr 2017 00:04:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C0F05785DF; Thu, 13 Apr 2017 00:04:33 +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 768A54E9BD; Thu, 13 Apr 2017 00:04:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v3D04ONb012188 for ; Wed, 12 Apr 2017 20:04:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id E772F173F3; Thu, 13 Apr 2017 00:04:24 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-15.phx2.redhat.com [10.3.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id A49BB17187 for ; Thu, 13 Apr 2017 00:04:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E608081F07 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E608081F07 From: John Ferlan To: libvir-list@redhat.com Date: Wed, 12 Apr 2017 20:04:18 -0400 Message-Id: <20170413000418.30018-6-jferlan@redhat.com> In-Reply-To: <20170413000418.30018-1-jferlan@redhat.com> References: <20170413000418.30018-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [REPOST PATCH 5/5] conf: Use consistent function name prefixes for virnetworkobj 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-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 13 Apr 2017 00:04:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use "virNetworkObj" as a prefix for any external API in virnetworkobj. Also a couple of functions were local to virnetworkobj.c, so remove their external defs in virnetworkobj.h. Signed-off-by: John Ferlan --- src/conf/virnetworkobj.c | 81 +++++++++++++++++++++++------------------= ---- src/conf/virnetworkobj.h | 51 ++++++++++------------------ src/libvirt_private.syms | 15 ++++----- src/network/bridge_driver.c | 57 +++++++++++++++---------------- src/test/test_driver.c | 14 ++++---- 5 files changed, 100 insertions(+), 118 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 55730e4..88e42b5 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -348,9 +348,9 @@ virNetworkObjUpdateAssignDef(virNetworkObjPtr network, * If flags is zero, network is considered as inactive and persistent. */ static virNetworkObjPtr -virNetworkAssignDefLocked(virNetworkObjListPtr nets, - virNetworkDefPtr def, - unsigned int flags) +virNetworkObjAssignDefLocked(virNetworkObjListPtr nets, + virNetworkDefPtr def, + unsigned int flags) { virNetworkObjPtr network; virNetworkObjPtr ret =3D NULL; @@ -416,7 +416,7 @@ virNetworkAssignDefLocked(virNetworkObjListPtr nets, =20 =20 /* - * virNetworkAssignDef: + * virNetworkObjAssignDef: * @nets: list of all networks * @def: the new NetworkDef (will be consumed by this function iff success= ful) * @flags: bitwise-OR of VIR_NETWORK_OBJ_LIST_ADD_* flags @@ -426,19 +426,19 @@ virNetworkAssignDefLocked(virNetworkObjListPtr nets, * def. For an existing network, use "live" and current state of the * network to determine which to replace. * - * Look at virNetworkAssignDefLocked() for @flags description. + * Look at virNetworkObjAssignDefLocked() for @flags description. * * Returns NULL on error, virNetworkObjPtr on success. */ virNetworkObjPtr -virNetworkAssignDef(virNetworkObjListPtr nets, - virNetworkDefPtr def, - unsigned int flags) +virNetworkObjAssignDef(virNetworkObjListPtr nets, + virNetworkDefPtr def, + unsigned int flags) { virNetworkObjPtr network; =20 virObjectLock(nets); - network =3D virNetworkAssignDefLocked(nets, def, flags); + network =3D virNetworkObjAssignDefLocked(nets, def, flags); virObjectUnlock(nets); return network; } @@ -534,7 +534,7 @@ virNetworkObjReplacePersistentDef(virNetworkObjPtr netw= ork, =20 =20 /* - * virNetworkConfigChangeSetup: + * virNetworkObjConfigChangeSetup: * * 1) checks whether network state is consistent with the requested * type of modification. @@ -544,9 +544,9 @@ virNetworkObjReplacePersistentDef(virNetworkObjPtr netw= ork, * * Returns 0 on success, -1 on error. */ -int -virNetworkConfigChangeSetup(virNetworkObjPtr network, - unsigned int flags) +static int +virNetworkObjConfigChangeSetup(virNetworkObjPtr network, + unsigned int flags) { bool isActive; int ret =3D -1; @@ -580,8 +580,8 @@ virNetworkConfigChangeSetup(virNetworkObjPtr network, =20 =20 void -virNetworkRemoveInactive(virNetworkObjListPtr nets, - virNetworkObjPtr net) +virNetworkObjRemoveInactive(virNetworkObjListPtr nets, + virNetworkObjPtr net) { char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 @@ -637,8 +637,8 @@ virNetworkObjFormat(virNetworkObjPtr net, =20 =20 int -virNetworkSaveStatus(const char *statusDir, - virNetworkObjPtr network) +virNetworkObjSaveStatus(const char *statusDir, + virNetworkObjPtr network) { int ret =3D -1; int flags =3D 0; @@ -657,7 +657,7 @@ virNetworkSaveStatus(const char *statusDir, } =20 =20 -virNetworkObjPtr +static virNetworkObjPtr virNetworkLoadState(virNetworkObjListPtr nets, const char *stateDir, const char *name) @@ -752,7 +752,8 @@ virNetworkLoadState(virNetworkObjListPtr nets, } =20 /* create the object */ - if (!(net =3D virNetworkAssignDef(nets, def, VIR_NETWORK_OBJ_LIST_ADD_= LIVE))) + if (!(net =3D virNetworkObjAssignDef(nets, def, + VIR_NETWORK_OBJ_LIST_ADD_LIVE))) goto error; /* do not put any "goto error" below this comment */ =20 @@ -782,7 +783,7 @@ virNetworkLoadState(virNetworkObjListPtr nets, } =20 =20 -virNetworkObjPtr +static virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, const char *configDir, const char *autostartDir, @@ -827,7 +828,7 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, def->mac_specified =3D false; } =20 - if (!(net =3D virNetworkAssignDef(nets, def, 0))) + if (!(net =3D virNetworkObjAssignDef(nets, def, 0))) goto error; =20 net->autostart =3D autostart; @@ -846,8 +847,8 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, =20 =20 int -virNetworkLoadAllState(virNetworkObjListPtr nets, - const char *stateDir) +virNetworkObjLoadAllState(virNetworkObjListPtr nets, + const char *stateDir) { DIR *dir; struct dirent *entry; @@ -873,9 +874,9 @@ virNetworkLoadAllState(virNetworkObjListPtr nets, =20 =20 int -virNetworkLoadAllConfigs(virNetworkObjListPtr nets, - const char *configDir, - const char *autostartDir) +virNetworkObjLoadAllConfigs(virNetworkObjListPtr nets, + const char *configDir, + const char *autostartDir) { DIR *dir; struct dirent *entry; @@ -906,9 +907,9 @@ virNetworkLoadAllConfigs(virNetworkObjListPtr nets, =20 =20 int -virNetworkDeleteConfig(const char *configDir, - const char *autostartDir, - virNetworkObjPtr net) +virNetworkObjDeleteConfig(const char *configDir, + const char *autostartDir, + virNetworkObjPtr net) { char *configFile =3D NULL; char *autostartLink =3D NULL; @@ -939,19 +940,19 @@ virNetworkDeleteConfig(const char *configDir, } =20 =20 -struct virNetworkBridgeInUseHelperData { +struct virNetworkObjBridgeInUseHelperData { const char *bridge; const char *skipname; }; =20 static int -virNetworkBridgeInUseHelper(const void *payload, - const void *name ATTRIBUTE_UNUSED, - const void *opaque) +virNetworkObjBridgeInUseHelper(const void *payload, + const void *name ATTRIBUTE_UNUSED, + const void *opaque) { int ret; virNetworkObjPtr net =3D (virNetworkObjPtr) payload; - const struct virNetworkBridgeInUseHelperData *data =3D opaque; + const struct virNetworkObjBridgeInUseHelperData *data =3D opaque; =20 virObjectLock(net); if (data->skipname && @@ -971,15 +972,15 @@ virNetworkBridgeInUseHelper(const void *payload, =20 =20 int -virNetworkBridgeInUse(virNetworkObjListPtr nets, - const char *bridge, - const char *skipname) +virNetworkObjBridgeInUse(virNetworkObjListPtr nets, + const char *bridge, + const char *skipname) { virNetworkObjPtr obj; - struct virNetworkBridgeInUseHelperData data =3D {bridge, skipname}; + struct virNetworkObjBridgeInUseHelperData data =3D {bridge, skipname}; =20 virObjectLock(nets); - obj =3D virHashSearch(nets->objs, virNetworkBridgeInUseHelper, &data); + obj =3D virHashSearch(nets->objs, virNetworkObjBridgeInUseHelper, &dat= a); virObjectUnlock(nets); =20 return obj !=3D NULL; @@ -1012,7 +1013,7 @@ virNetworkObjUpdate(virNetworkObjPtr network, virNetworkDefPtr livedef =3D NULL, configdef =3D NULL; =20 /* normalize config data, and check for common invalid requests. */ - if (virNetworkConfigChangeSetup(network, flags) < 0) + if (virNetworkObjConfigChangeSetup(network, flags) < 0) goto cleanup; =20 if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) { diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index 0b6fbfe..8090c2e 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -90,9 +90,9 @@ typedef bool virNetworkDefPtr def); =20 virNetworkObjPtr -virNetworkAssignDef(virNetworkObjListPtr nets, - virNetworkDefPtr def, - unsigned int flags); +virNetworkObjAssignDef(virNetworkObjListPtr nets, + virNetworkDefPtr def, + unsigned int flags); =20 void virNetworkObjUpdateAssignDef(virNetworkObjPtr network, @@ -113,47 +113,32 @@ int virNetworkObjReplacePersistentDef(virNetworkObjPtr network, virNetworkDefPtr def); =20 -int -virNetworkConfigChangeSetup(virNetworkObjPtr dom, - unsigned int flags); - void -virNetworkRemoveInactive(virNetworkObjListPtr nets, - virNetworkObjPtr net); +virNetworkObjRemoveInactive(virNetworkObjListPtr nets, + virNetworkObjPtr net); =20 int -virNetworkSaveStatus(const char *statusDir, - virNetworkObjPtr net) ATTRIBUTE_RETURN_CHECK; - -virNetworkObjPtr -virNetworkLoadConfig(virNetworkObjListPtr nets, - const char *configDir, - const char *autostartDir, - const char *file); - -virNetworkObjPtr -virNetworkLoadState(virNetworkObjListPtr nets, - const char *stateDir, - const char *name); +virNetworkObjSaveStatus(const char *statusDir, + virNetworkObjPtr net) ATTRIBUTE_RETURN_CHECK; =20 int -virNetworkLoadAllConfigs(virNetworkObjListPtr nets, - const char *configDir, - const char *autostartDir); +virNetworkObjLoadAllConfigs(virNetworkObjListPtr nets, + const char *configDir, + const char *autostartDir); =20 int -virNetworkLoadAllState(virNetworkObjListPtr nets, - const char *stateDir); +virNetworkObjLoadAllState(virNetworkObjListPtr nets, + const char *stateDir); =20 int -virNetworkDeleteConfig(const char *configDir, - const char *autostartDir, - virNetworkObjPtr net); +virNetworkObjDeleteConfig(const char *configDir, + const char *autostartDir, + virNetworkObjPtr net); =20 int -virNetworkBridgeInUse(virNetworkObjListPtr nets, - const char *bridge, - const char *skipname); +virNetworkObjBridgeInUse(virNetworkObjListPtr nets, + const char *bridge, + const char *skipname); =20 int virNetworkObjUpdate(virNetworkObjPtr obj, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6aaa3f9..4861257 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -919,12 +919,9 @@ virInterfaceObjUnlock; =20 =20 # conf/virnetworkobj.h -virNetworkAssignDef; -virNetworkBridgeInUse; -virNetworkConfigChangeSetup; -virNetworkDeleteConfig; -virNetworkLoadAllConfigs; -virNetworkLoadAllState; +virNetworkObjAssignDef; +virNetworkObjBridgeInUse; +virNetworkObjDeleteConfig; virNetworkObjEndAPI; virNetworkObjFindByName; virNetworkObjFindByNameLocked; @@ -937,15 +934,17 @@ virNetworkObjListGetNames; virNetworkObjListNew; virNetworkObjListNumOfNetworks; virNetworkObjListPrune; +virNetworkObjLoadAllConfigs; +virNetworkObjLoadAllState; virNetworkObjNew; +virNetworkObjRemoveInactive; virNetworkObjReplacePersistentDef; +virNetworkObjSaveStatus; virNetworkObjSetDefTransient; virNetworkObjTaint; virNetworkObjUnsetDefTransient; virNetworkObjUpdate; virNetworkObjUpdateAssignDef; -virNetworkRemoveInactive; -virNetworkSaveStatus; =20 =20 # conf/virnodedeviceobj.h diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b30caf5..45abe16 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -363,7 +363,7 @@ networkRemoveInactive(virNetworkDriverStatePtr driver, unlink(statusfile); =20 /* remove the network definition */ - virNetworkRemoveInactive(driver->networks, net); + virNetworkObjRemoveInactive(driver->networks, net); =20 ret =3D 0; =20 @@ -753,13 +753,13 @@ networkStateInitialize(bool privileged, if (!(network_driver->networks =3D virNetworkObjListNew())) goto error; =20 - if (virNetworkLoadAllState(network_driver->networks, - network_driver->stateDir) < 0) + if (virNetworkObjLoadAllState(network_driver->networks, + network_driver->stateDir) < 0) goto error; =20 - if (virNetworkLoadAllConfigs(network_driver->networks, - network_driver->networkConfigDir, - network_driver->networkAutostartDir) < 0) + if (virNetworkObjLoadAllConfigs(network_driver->networks, + network_driver->networkConfigDir, + network_driver->networkAutostartDir) <= 0) goto error; =20 /* Update the internal status of all allegedly active @@ -841,11 +841,11 @@ networkStateReload(void) if (!network_driver) return 0; =20 - virNetworkLoadAllState(network_driver->networks, - network_driver->stateDir); - virNetworkLoadAllConfigs(network_driver->networks, - network_driver->networkConfigDir, - network_driver->networkAutostartDir); + virNetworkObjLoadAllState(network_driver->networks, + network_driver->stateDir); + virNetworkObjLoadAllConfigs(network_driver->networks, + network_driver->networkConfigDir, + network_driver->networkAutostartDir); networkReloadFirewallRules(network_driver); networkRefreshDaemons(network_driver); virNetworkObjListForEach(network_driver->networks, @@ -2751,7 +2751,7 @@ networkStartNetwork(virNetworkDriverStatePtr driver, * is setup. */ VIR_DEBUG("Writing network status to disk"); - if (virNetworkSaveStatus(driver->stateDir, network) < 0) + if (virNetworkObjSaveStatus(driver->stateDir, network) < 0) goto cleanup; =20 network->active =3D 1; @@ -3076,7 +3076,7 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, * from virNetDevExists(), just in case it isn't implemented * on this platform (probably impossible). */ - if (!(virNetworkBridgeInUse(nets, newname, def->name) || + if (!(virNetworkObjBridgeInUse(nets, newname, def->name) || virNetDevExists(newname) =3D=3D 1)) { VIR_FREE(def->bridge); /*could contain template */ def->bridge =3D newname; @@ -3112,7 +3112,7 @@ networkBridgeNameValidate(virNetworkObjListPtr nets, int ret =3D -1; =20 if (def->bridge && !strstr(def->bridge, "%d")) { - if (virNetworkBridgeInUse(nets, def->bridge, def->name)) { + if (virNetworkObjBridgeInUse(nets, def->bridge, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("bridge name '%s' already in use."), def->bridge); @@ -3429,15 +3429,14 @@ static virNetworkPtr networkCreateXML(virConnectPtr= conn, const char *xml) * we assign the def with live =3D true in anticipation that it will * be started momentarily. */ - if (!(network =3D virNetworkAssignDef(driver->networks, def, - VIR_NETWORK_OBJ_LIST_ADD_LIVE | - VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIV= E))) + if (!(network =3D virNetworkObjAssignDef(driver->networks, def, + VIR_NETWORK_OBJ_LIST_ADD_LIVE | + VIR_NETWORK_OBJ_LIST_ADD_CHECK_= LIVE))) goto cleanup; def =3D NULL; =20 if (networkStartNetwork(driver, network) < 0) { - virNetworkRemoveInactive(driver->networks, - network); + virNetworkObjRemoveInactive(driver->networks, network); goto cleanup; } =20 @@ -3475,7 +3474,7 @@ static virNetworkPtr networkDefineXML(virConnectPtr c= onn, const char *xml) if (networkValidate(driver, def) < 0) goto cleanup; =20 - if (!(network =3D virNetworkAssignDef(driver->networks, def, 0))) + if (!(network =3D virNetworkObjAssignDef(driver->networks, def, 0))) goto cleanup; =20 /* def was assigned to network object */ @@ -3483,7 +3482,7 @@ static virNetworkPtr networkDefineXML(virConnectPtr c= onn, const char *xml) =20 if (virNetworkSaveConfig(driver->networkConfigDir, def) < 0) { if (!virNetworkObjIsActive(network)) { - virNetworkRemoveInactive(driver->networks, network); + virNetworkObjRemoveInactive(driver->networks, network); goto cleanup; } /* if network was active already, just undo new persistent @@ -3535,9 +3534,9 @@ networkUndefine(virNetworkPtr net) } =20 /* remove autostart link */ - if (virNetworkDeleteConfig(driver->networkConfigDir, - driver->networkAutostartDir, - network) < 0) + if (virNetworkObjDeleteConfig(driver->networkConfigDir, + driver->networkAutostartDir, + network) < 0) goto cleanup; =20 event =3D virNetworkEventLifecycleNew(network->def->name, @@ -3725,10 +3724,8 @@ networkUpdate(virNetworkPtr net, } =20 /* save current network state to disk */ - if ((ret =3D virNetworkSaveStatus(driver->stateDir, - network)) < 0) { + if ((ret =3D virNetworkObjSaveStatus(driver->stateDir, network)) <= 0) goto cleanup; - } } =20 /* call the 'updated' network hook script */ @@ -5312,7 +5309,7 @@ networkPlugBandwidthImpl(virNetworkObjPtr net, /* update sum of 'floor'-s of attached NICs */ net->floor_sum +=3D ifaceBand->in->floor; /* update status file */ - if (virNetworkSaveStatus(driver->stateDir, net) < 0) { + if (virNetworkObjSaveStatus(driver->stateDir, net) < 0) { ignore_value(virBitmapClearBit(net->class_id, class_id)); net->floor_sum -=3D ifaceBand->in->floor; iface->data.network.actual->class_id =3D 0; @@ -5404,7 +5401,7 @@ networkUnplugBandwidth(virNetworkObjPtr net, ignore_value(virBitmapClearBit(net->class_id, iface->data.network.actual->class_i= d)); /* update status file */ - if (virNetworkSaveStatus(driver->stateDir, net) < 0) { + if (virNetworkObjSaveStatus(driver->stateDir, net) < 0) { net->floor_sum +=3D ifaceBand->in->floor; ignore_value(virBitmapSetBit(net->class_id, iface->data.network.actual->class= _id)); @@ -5548,7 +5545,7 @@ networkBandwidthUpdate(virDomainNetDefPtr iface, =20 if (virNetDevBandwidthUpdateRate(network->def->bridge, 2, network->def->bandwidth, new_rate= ) < 0 || - virNetworkSaveStatus(driver->stateDir, network) < 0) { + virNetworkObjSaveStatus(driver->stateDir, network) < 0) { /* Ouch, rollback */ network->floor_sum -=3D newBandwidth->in->floor; network->floor_sum +=3D ifaceBand->in->floor; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1fd7414..12eecea 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -980,7 +980,7 @@ testParseNetworks(testDriverPtr privconn, if (!def) goto error; =20 - if (!(obj =3D virNetworkAssignDef(privconn->networks, def, 0))) { + if (!(obj =3D virNetworkObjAssignDef(privconn->networks, def, 0)))= { virNetworkDefFree(def); goto error; } @@ -3371,9 +3371,9 @@ static virNetworkPtr testNetworkCreateXML(virConnectP= tr conn, const char *xml) if ((def =3D virNetworkDefParseString(xml)) =3D=3D NULL) goto cleanup; =20 - if (!(net =3D virNetworkAssignDef(privconn->networks, def, - VIR_NETWORK_OBJ_LIST_ADD_LIVE | - VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE))) + if (!(net =3D virNetworkObjAssignDef(privconn->networks, def, + VIR_NETWORK_OBJ_LIST_ADD_LIVE | + VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE= ))) goto cleanup; def =3D NULL; net->active =3D 1; @@ -3403,7 +3403,7 @@ virNetworkPtr testNetworkDefineXML(virConnectPtr conn= , const char *xml) if ((def =3D virNetworkDefParseString(xml)) =3D=3D NULL) goto cleanup; =20 - if (!(net =3D virNetworkAssignDef(privconn->networks, def, 0))) + if (!(net =3D virNetworkObjAssignDef(privconn->networks, def, 0))) goto cleanup; def =3D NULL; =20 @@ -3440,7 +3440,7 @@ static int testNetworkUndefine(virNetworkPtr network) VIR_NETWORK_EVENT_UNDEFINED, 0); =20 - virNetworkRemoveInactive(privconn->networks, privnet); + virNetworkObjRemoveInactive(privconn->networks, privnet); ret =3D 0; =20 cleanup: @@ -3534,7 +3534,7 @@ static int testNetworkDestroy(virNetworkPtr network) VIR_NETWORK_EVENT_STOPPED, 0); if (!privnet->persistent) - virNetworkRemoveInactive(privconn->networks, privnet); + virNetworkObjRemoveInactive(privconn->networks, privnet); =20 ret =3D 0; =20 --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list