From nobody Thu May 15 23:00:04 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1501081649936712.0006952207951; Wed, 26 Jul 2017 08:07:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E12AA7A162; Wed, 26 Jul 2017 15:07:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B7E547B559; Wed, 26 Jul 2017 15:07: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 D896C1805983; Wed, 26 Jul 2017 15:06:56 +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 v6QF6teM028849 for ; Wed, 26 Jul 2017 11:06:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 731026A311; Wed, 26 Jul 2017 15:06:55 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-46.phx2.redhat.com [10.3.117.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB7206A321 for ; Wed, 26 Jul 2017 15:06:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E12AA7A162 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: John Ferlan To: libvir-list@redhat.com Date: Wed, 26 Jul 2017 11:05:31 -0400 Message-Id: <20170726150537.4619-15-jferlan@redhat.com> In-Reply-To: <20170726150537.4619-1-jferlan@redhat.com> References: <20170726150537.4619-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 14/20] network: Consistent use of @obj 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 26 Jul 2017 15:07:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Consistently use @obj for a virNetworkObjPtr. Signed-off-by: John Ferlan --- src/conf/virnetworkobj.c | 333 +++++++++++++++++++++++--------------------= ---- 1 file changed, 166 insertions(+), 167 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 37b76e5..edea6f5 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -71,39 +71,39 @@ VIR_ONCE_GLOBAL_INIT(virNetworkObj) virNetworkObjPtr virNetworkObjNew(void) { - virNetworkObjPtr net; + virNetworkObjPtr obj; =20 if (virNetworkObjInitialize() < 0) return NULL; =20 - if (!(net =3D virObjectLockableNew(virNetworkObjClass))) + if (!(obj =3D virObjectLockableNew(virNetworkObjClass))) return NULL; =20 - if (!(net->classIdMap =3D virBitmapNew(CLASS_ID_BITMAP_SIZE))) + if (!(obj->classIdMap =3D virBitmapNew(CLASS_ID_BITMAP_SIZE))) goto error; =20 /* The first three class IDs are already taken */ - ignore_value(virBitmapSetBit(net->classIdMap, 0)); - ignore_value(virBitmapSetBit(net->classIdMap, 1)); - ignore_value(virBitmapSetBit(net->classIdMap, 2)); + ignore_value(virBitmapSetBit(obj->classIdMap, 0)); + ignore_value(virBitmapSetBit(obj->classIdMap, 1)); + ignore_value(virBitmapSetBit(obj->classIdMap, 2)); =20 - return net; + return obj; =20 error: - virObjectUnref(net); + virObjectUnref(obj); return NULL; } =20 =20 void -virNetworkObjEndAPI(virNetworkObjPtr *net) +virNetworkObjEndAPI(virNetworkObjPtr *obj) { - if (!*net) + if (!*obj) return; =20 - virObjectUnlock(*net); - virObjectUnref(*net); - *net =3D NULL; + virObjectUnlock(*obj); + virObjectUnref(*obj); + *obj =3D NULL; } =20 =20 @@ -336,15 +336,15 @@ virNetworkObjPtr virNetworkObjFindByUUIDLocked(virNetworkObjListPtr nets, const unsigned char *uuid) { - virNetworkObjPtr ret =3D NULL; + virNetworkObjPtr obj =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 virUUIDFormat(uuid, uuidstr); =20 - ret =3D virHashLookup(nets->objs, uuidstr); - if (ret) - virObjectRef(ret); - return ret; + obj =3D virHashLookup(nets->objs, uuidstr); + if (obj) + virObjectRef(obj); + return obj; } =20 =20 @@ -362,14 +362,14 @@ virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets, const unsigned char *uuid) { - virNetworkObjPtr ret; + virNetworkObjPtr obj; =20 virObjectLock(nets); - ret =3D virNetworkObjFindByUUIDLocked(nets, uuid); + obj =3D virNetworkObjFindByUUIDLocked(nets, uuid); virObjectUnlock(nets); - if (ret) - virObjectLock(ret); - return ret; + if (obj) + virObjectLock(obj); + return obj; } =20 =20 @@ -378,13 +378,13 @@ virNetworkObjSearchName(const void *payload, const void *name ATTRIBUTE_UNUSED, const void *data) { - virNetworkObjPtr net =3D (virNetworkObjPtr) payload; + virNetworkObjPtr obj =3D (virNetworkObjPtr) payload; int want =3D 0; =20 - virObjectLock(net); - if (STREQ(net->def->name, (const char *)data)) + virObjectLock(obj); + if (STREQ(obj->def->name, (const char *)data)) want =3D 1; - virObjectUnlock(net); + virObjectUnlock(obj); return want; } =20 @@ -402,12 +402,12 @@ virNetworkObjPtr virNetworkObjFindByNameLocked(virNetworkObjListPtr nets, const char *name) { - virNetworkObjPtr ret =3D NULL; + virNetworkObjPtr obj =3D NULL; =20 - ret =3D virHashSearch(nets->objs, virNetworkObjSearchName, name, NULL); - if (ret) - virObjectRef(ret); - return ret; + obj =3D virHashSearch(nets->objs, virNetworkObjSearchName, name, NULL); + if (obj) + virObjectRef(obj); + return obj; } =20 =20 @@ -425,14 +425,14 @@ virNetworkObjPtr virNetworkObjFindByName(virNetworkObjListPtr nets, const char *name) { - virNetworkObjPtr ret; + virNetworkObjPtr obj; =20 virObjectLock(nets); - ret =3D virNetworkObjFindByNameLocked(nets, name); + obj =3D virNetworkObjFindByNameLocked(nets, name); virObjectUnlock(nets); - if (ret) - virObjectLock(ret); - return ret; + if (obj) + virObjectLock(obj); + return obj; } =20 =20 @@ -451,21 +451,21 @@ virNetworkObjTaint(virNetworkObjPtr obj, =20 =20 static void -virNetworkObjDispose(void *obj) +virNetworkObjDispose(void *opaque) { - virNetworkObjPtr net =3D obj; + virNetworkObjPtr obj =3D opaque; =20 - virNetworkDefFree(net->def); - virNetworkDefFree(net->newDef); - virBitmapFree(net->classIdMap); - virObjectUnref(net->macmap); + virNetworkDefFree(obj->def); + virNetworkDefFree(obj->newDef); + virBitmapFree(obj->classIdMap); + virObjectUnref(obj->macmap); } =20 =20 static void -virNetworkObjListDispose(void *obj) +virNetworkObjListDispose(void *opaque) { - virNetworkObjListPtr nets =3D obj; + virNetworkObjListPtr nets =3D opaque; =20 virHashFree(nets->objs); } @@ -488,7 +488,7 @@ virNetworkObjListDispose(void *obj) * */ void -virNetworkObjUpdateAssignDef(virNetworkObjPtr network, +virNetworkObjUpdateAssignDef(virNetworkObjPtr obj, virNetworkDefPtr def, bool live) { @@ -497,38 +497,38 @@ virNetworkObjUpdateAssignDef(virNetworkObjPtr network, * existing persistent (!live) def to be restored when the * network is destroyed, unless there is one already saved. */ - if (network->persistent && !network->newDef) - network->newDef =3D network->def; + if (obj->persistent && !obj->newDef) + obj->newDef =3D obj->def; else - virNetworkDefFree(network->def); - network->def =3D def; + virNetworkDefFree(obj->def); + obj->def =3D def; } else { /* !live */ - virNetworkDefFree(network->newDef); - if (virNetworkObjIsActive(network)) { + virNetworkDefFree(obj->newDef); + if (virNetworkObjIsActive(obj)) { /* save new configuration to be restored on network * shutdown, leaving current live def alone */ - network->newDef =3D def; + obj->newDef =3D def; } else { /* !live and !active */ - if (network->def && !network->persistent) { + if (obj->def && !obj->persistent) { /* network isn't (yet) marked active or persistent, * but already has a "live" def set. This means we are * currently setting the persistent def as a part of * the process of starting the network, so we need to * preserve the "not yet live" def in network->def. */ - network->newDef =3D def; + obj->newDef =3D def; } else { /* either there is no live def set, or this network * was already set as persistent, so the proper thing * is to overwrite network->def. */ - network->newDef =3D NULL; - virNetworkDefFree(network->def); - network->def =3D def; + obj->newDef =3D NULL; + virNetworkDefFree(obj->def); + obj->def =3D def; } } - network->persistent =3D !!def; + obj->persistent =3D !!def; } } =20 @@ -548,65 +548,64 @@ virNetworkObjAssignDefLocked(virNetworkObjListPtr net= s, virNetworkDefPtr def, unsigned int flags) { - virNetworkObjPtr network; + virNetworkObjPtr obj; virNetworkObjPtr ret =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 /* See if a network with matching UUID already exists */ - if ((network =3D virNetworkObjFindByUUIDLocked(nets, def->uuid))) { - virObjectLock(network); + if ((obj =3D virNetworkObjFindByUUIDLocked(nets, def->uuid))) { + virObjectLock(obj); /* UUID matches, but if names don't match, refuse it */ - if (STRNEQ(network->def->name, def->name)) { - virUUIDFormat(network->def->uuid, uuidstr); + if (STRNEQ(obj->def->name, def->name)) { + virUUIDFormat(obj->def->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, _("network '%s' is already defined with uuid %s= "), - network->def->name, uuidstr); + obj->def->name, uuidstr); goto cleanup; } =20 if (flags & VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE) { /* UUID & name match, but if network is already active, refuse= it */ - if (virNetworkObjIsActive(network)) { + if (virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, _("network is already active as '%s'"), - network->def->name); + obj->def->name); goto cleanup; } } =20 - virNetworkObjUpdateAssignDef(network, - def, + virNetworkObjUpdateAssignDef(obj, def, !!(flags & VIR_NETWORK_OBJ_LIST_ADD_L= IVE)); } else { /* UUID does not match, but if a name matches, refuse it */ - if ((network =3D virNetworkObjFindByNameLocked(nets, def->name))) { - virObjectLock(network); - virUUIDFormat(network->def->uuid, uuidstr); + if ((obj =3D virNetworkObjFindByNameLocked(nets, def->name))) { + virObjectLock(obj); + virUUIDFormat(obj->def->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, _("network '%s' already exists with uuid %s"), def->name, uuidstr); goto cleanup; } =20 - if (!(network =3D virNetworkObjNew())) + if (!(obj =3D virNetworkObjNew())) goto cleanup; =20 - virObjectLock(network); + virObjectLock(obj); =20 virUUIDFormat(def->uuid, uuidstr); - if (virHashAddEntry(nets->objs, uuidstr, network) < 0) + if (virHashAddEntry(nets->objs, uuidstr, obj) < 0) goto cleanup; =20 - network->def =3D def; - network->persistent =3D !(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE); - virObjectRef(network); + obj->def =3D def; + obj->persistent =3D !(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE); + virObjectRef(obj); } =20 - ret =3D network; - network =3D NULL; + ret =3D obj; + obj =3D NULL; =20 cleanup: - virNetworkObjEndAPI(&network); + virNetworkObjEndAPI(&obj); return ret; } =20 @@ -631,12 +630,12 @@ virNetworkObjAssignDef(virNetworkObjListPtr nets, virNetworkDefPtr def, unsigned int flags) { - virNetworkObjPtr network; + virNetworkObjPtr obj; =20 virObjectLock(nets); - network =3D virNetworkObjAssignDefLocked(nets, def, flags); + obj =3D virNetworkObjAssignDefLocked(nets, def, flags); virObjectUnlock(nets); - return network; + return obj; } =20 =20 @@ -655,17 +654,17 @@ virNetworkObjAssignDef(virNetworkObjListPtr nets, * Returns 0 on success, -1 on failure */ int -virNetworkObjSetDefTransient(virNetworkObjPtr network, +virNetworkObjSetDefTransient(virNetworkObjPtr obj, bool live) { - if (!virNetworkObjIsActive(network) && !live) + if (!virNetworkObjIsActive(obj) && !live) return 0; =20 - if (!network->persistent || network->newDef) + if (!obj->persistent || obj->newDef) return 0; =20 - network->newDef =3D virNetworkDefCopy(network->def, VIR_NETWORK_XML_IN= ACTIVE); - return network->newDef ? 0 : -1; + obj->newDef =3D virNetworkDefCopy(obj->def, VIR_NETWORK_XML_INACTIVE); + return obj->newDef ? 0 : -1; } =20 =20 @@ -674,12 +673,12 @@ virNetworkObjSetDefTransient(virNetworkObjPtr network, * This *undoes* what virNetworkObjSetDefTransient did. */ void -virNetworkObjUnsetDefTransient(virNetworkObjPtr network) +virNetworkObjUnsetDefTransient(virNetworkObjPtr obj) { - if (network->newDef) { - virNetworkDefFree(network->def); - network->def =3D network->newDef; - network->newDef =3D NULL; + if (obj->newDef) { + virNetworkDefFree(obj->def); + obj->def =3D obj->newDef; + obj->newDef =3D NULL; } } =20 @@ -694,12 +693,12 @@ virNetworkObjUnsetDefTransient(virNetworkObjPtr netwo= rk) * Returns NULL on error, virNetworkDefPtr on success. */ virNetworkDefPtr -virNetworkObjGetPersistentDef(virNetworkObjPtr network) +virNetworkObjGetPersistentDef(virNetworkObjPtr obj) { - if (network->newDef) - return network->newDef; + if (obj->newDef) + return obj->newDef; else - return network->def; + return obj->def; } =20 =20 @@ -715,15 +714,15 @@ virNetworkObjGetPersistentDef(virNetworkObjPtr networ= k) * Returns -1 on error, 0 on success */ int -virNetworkObjReplacePersistentDef(virNetworkObjPtr network, +virNetworkObjReplacePersistentDef(virNetworkObjPtr obj, virNetworkDefPtr def) { - if (virNetworkObjIsActive(network)) { - virNetworkDefFree(network->newDef); - network->newDef =3D def; + if (virNetworkObjIsActive(obj)) { + virNetworkDefFree(obj->newDef); + obj->newDef =3D def; } else { - virNetworkDefFree(network->def); - network->def =3D def; + virNetworkDefFree(obj->def); + obj->def =3D def; } return 0; } @@ -741,13 +740,13 @@ virNetworkObjReplacePersistentDef(virNetworkObjPtr ne= twork, * Returns 0 on success, -1 on error. */ static int -virNetworkObjConfigChangeSetup(virNetworkObjPtr network, +virNetworkObjConfigChangeSetup(virNetworkObjPtr obj, unsigned int flags) { bool isActive; int ret =3D -1; =20 - isActive =3D virNetworkObjIsActive(network); + isActive =3D virNetworkObjIsActive(obj); =20 if (!isActive && (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -756,7 +755,7 @@ virNetworkObjConfigChangeSetup(virNetworkObjPtr network, } =20 if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { - if (!network->persistent) { + if (!obj->persistent) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot change persistent config of a " "transient network")); @@ -765,7 +764,7 @@ virNetworkObjConfigChangeSetup(virNetworkObjPtr network, /* this should already have been done by the driver, but do it * anyway just in case. */ - if (isActive && (virNetworkObjSetDefTransient(network, false) < 0)) + if (isActive && (virNetworkObjSetDefTransient(obj, false) < 0)) goto cleanup; } =20 @@ -777,27 +776,27 @@ virNetworkObjConfigChangeSetup(virNetworkObjPtr netwo= rk, =20 void virNetworkObjRemoveInactive(virNetworkObjListPtr nets, - virNetworkObjPtr net) + virNetworkObjPtr obj) { char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - virUUIDFormat(net->def->uuid, uuidstr); - virObjectRef(net); - virObjectUnlock(net); + virUUIDFormat(obj->def->uuid, uuidstr); + virObjectRef(obj); + virObjectUnlock(obj); virObjectLock(nets); - virObjectLock(net); + virObjectLock(obj); virHashRemoveEntry(nets->objs, uuidstr); virObjectUnlock(nets); - virObjectUnref(net); + virObjectUnref(obj); } =20 =20 static char * -virNetworkObjFormat(virNetworkObjPtr net, +virNetworkObjFormat(virNetworkObjPtr obj, unsigned int flags) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; - char *classIdStr =3D virBitmapFormat(net->classIdMap); + char *classIdStr =3D virBitmapFormat(obj->classIdMap); size_t i; =20 if (!classIdStr) @@ -806,16 +805,16 @@ virNetworkObjFormat(virNetworkObjPtr net, virBufferAddLit(&buf, "\n"); virBufferAdjustIndent(&buf, 2); virBufferAsprintf(&buf, "\n", classIdStr); - virBufferAsprintf(&buf, "\n", net->floor_sum); + virBufferAsprintf(&buf, "\n", obj->floor_sum); VIR_FREE(classIdStr); =20 for (i =3D 0; i < VIR_NETWORK_TAINT_LAST; i++) { - if (net->taint & (1 << i)) + if (obj->taint & (1 << i)) virBufferAsprintf(&buf, "\n", virNetworkTaintTypeToString(i)); } =20 - if (virNetworkDefFormatBuf(&buf, net->def, flags) < 0) + if (virNetworkDefFormatBuf(&buf, obj->def, flags) < 0) goto error; =20 virBufferAdjustIndent(&buf, -2); @@ -834,16 +833,16 @@ virNetworkObjFormat(virNetworkObjPtr net, =20 int virNetworkObjSaveStatus(const char *statusDir, - virNetworkObjPtr network) + virNetworkObjPtr obj) { int ret =3D -1; int flags =3D 0; char *xml; =20 - if (!(xml =3D virNetworkObjFormat(network, flags))) + if (!(xml =3D virNetworkObjFormat(obj, flags))) goto cleanup; =20 - if (virNetworkSaveXML(statusDir, network->def, xml)) + if (virNetworkSaveXML(statusDir, obj->def, xml)) goto cleanup; =20 ret =3D 0; @@ -860,7 +859,7 @@ virNetworkLoadState(virNetworkObjListPtr nets, { char *configFile =3D NULL; virNetworkDefPtr def =3D NULL; - virNetworkObjPtr net =3D NULL; + virNetworkObjPtr obj =3D NULL; xmlDocPtr xml =3D NULL; xmlNodePtr node =3D NULL, *nodes =3D NULL; xmlXPathContextPtr ctxt =3D NULL; @@ -949,28 +948,28 @@ virNetworkLoadState(virNetworkObjListPtr nets, } =20 /* create the object */ - if (!(net =3D virNetworkObjAssignDef(nets, def, + if (!(obj =3D virNetworkObjAssignDef(nets, def, VIR_NETWORK_OBJ_LIST_ADD_LIVE))) goto error; /* do not put any "goto error" below this comment */ =20 /* assign status data stored in the network object */ if (classIdMap) { - virBitmapFree(net->classIdMap); - net->classIdMap =3D classIdMap; + virBitmapFree(obj->classIdMap); + obj->classIdMap =3D classIdMap; } =20 if (floor_sum_val > 0) - net->floor_sum =3D floor_sum_val; + obj->floor_sum =3D floor_sum_val; =20 - net->taint =3D taint; - net->active =3D true; /* any network with a state file is by definitio= n active */ + obj->taint =3D taint; + obj->active =3D true; /* network with a state file is by definition ac= tive */ =20 cleanup: VIR_FREE(configFile); xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); - return net; + return obj; =20 error: VIR_FREE(nodes); @@ -988,7 +987,7 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, { char *configFile =3D NULL, *autostartLink =3D NULL; virNetworkDefPtr def =3D NULL; - virNetworkObjPtr net; + virNetworkObjPtr obj; int autostart; =20 if ((configFile =3D virNetworkConfigFile(configDir, name)) =3D=3D NULL) @@ -1025,15 +1024,15 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, def->mac_specified =3D false; } =20 - if (!(net =3D virNetworkObjAssignDef(nets, def, 0))) + if (!(obj =3D virNetworkObjAssignDef(nets, def, 0))) goto error; =20 - net->autostart =3D autostart; + obj->autostart =3D autostart; =20 VIR_FREE(configFile); VIR_FREE(autostartLink); =20 - return net; + return obj; =20 error: VIR_FREE(configFile); @@ -1056,13 +1055,13 @@ virNetworkObjLoadAllState(virNetworkObjListPtr nets, return rc; =20 while ((ret =3D virDirRead(dir, &entry, stateDir)) > 0) { - virNetworkObjPtr net; + virNetworkObjPtr obj; =20 if (!virFileStripSuffix(entry->d_name, ".xml")) continue; =20 - net =3D virNetworkLoadState(nets, stateDir, entry->d_name); - virNetworkObjEndAPI(&net); + obj =3D virNetworkLoadState(nets, stateDir, entry->d_name); + virNetworkObjEndAPI(&obj); } =20 VIR_DIR_CLOSE(dir); @@ -1084,18 +1083,18 @@ virNetworkObjLoadAllConfigs(virNetworkObjListPtr ne= ts, return rc; =20 while ((ret =3D virDirRead(dir, &entry, configDir)) > 0) { - virNetworkObjPtr net; + virNetworkObjPtr obj; =20 if (!virFileStripSuffix(entry->d_name, ".xml")) continue; =20 /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ - net =3D virNetworkLoadConfig(nets, + obj =3D virNetworkLoadConfig(nets, configDir, autostartDir, entry->d_name); - virNetworkObjEndAPI(&net); + virNetworkObjEndAPI(&obj); } =20 VIR_DIR_CLOSE(dir); @@ -1106,20 +1105,20 @@ virNetworkObjLoadAllConfigs(virNetworkObjListPtr ne= ts, int virNetworkObjDeleteConfig(const char *configDir, const char *autostartDir, - virNetworkObjPtr net) + virNetworkObjPtr obj) { char *configFile =3D NULL; char *autostartLink =3D NULL; int ret =3D -1; =20 - if ((configFile =3D virNetworkConfigFile(configDir, net->def->name)) = =3D=3D NULL) + if (!(configFile =3D virNetworkConfigFile(configDir, obj->def->name))) goto error; - if ((autostartLink =3D virNetworkConfigFile(autostartDir, net->def->na= me)) =3D=3D NULL) + if (!(autostartLink =3D virNetworkConfigFile(autostartDir, obj->def->n= ame))) goto error; =20 /* Not fatal if this doesn't work */ unlink(autostartLink); - net->autostart =3D 0; + obj->autostart =3D 0; =20 if (unlink(configFile) < 0) { virReportSystemError(errno, @@ -1148,22 +1147,22 @@ virNetworkObjBridgeInUseHelper(const void *payload, const void *opaque) { int ret; - virNetworkObjPtr net =3D (virNetworkObjPtr) payload; + virNetworkObjPtr obj =3D (virNetworkObjPtr) payload; const struct virNetworkObjBridgeInUseHelperData *data =3D opaque; =20 - virObjectLock(net); + virObjectLock(obj); if (data->skipname && - ((net->def && STREQ(net->def->name, data->skipname)) || - (net->newDef && STREQ(net->newDef->name, data->skipname)))) + ((obj->def && STREQ(obj->def->name, data->skipname)) || + (obj->newDef && STREQ(obj->newDef->name, data->skipname)))) ret =3D 0; - else if ((net->def && net->def->bridge && - STREQ(net->def->bridge, data->bridge)) || - (net->newDef && net->newDef->bridge && - STREQ(net->newDef->bridge, data->bridge))) + else if ((obj->def && obj->def->bridge && + STREQ(obj->def->bridge, data->bridge)) || + (obj->newDef && obj->newDef->bridge && + STREQ(obj->newDef->bridge, data->bridge))) ret =3D 1; else ret =3D 0; - virObjectUnlock(net); + virObjectUnlock(obj); return ret; } =20 @@ -1199,7 +1198,7 @@ virNetworkObjBridgeInUse(virNetworkObjListPtr nets, * Returns: -1 on error, 0 on success. */ int -virNetworkObjUpdate(virNetworkObjPtr network, +virNetworkObjUpdate(virNetworkObjPtr obj, unsigned int command, /* virNetworkUpdateCommand */ unsigned int section, /* virNetworkUpdateSection */ int parentIndex, @@ -1210,14 +1209,14 @@ virNetworkObjUpdate(virNetworkObjPtr network, virNetworkDefPtr livedef =3D NULL, configdef =3D NULL; =20 /* normalize config data, and check for common invalid requests. */ - if (virNetworkObjConfigChangeSetup(network, flags) < 0) + if (virNetworkObjConfigChangeSetup(obj, flags) < 0) goto cleanup; =20 if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) { virNetworkDefPtr checkdef; =20 /* work on a copy of the def */ - if (!(livedef =3D virNetworkDefCopy(network->def, 0))) + if (!(livedef =3D virNetworkDefCopy(obj->def, 0))) goto cleanup; if (virNetworkDefUpdateSection(livedef, command, section, parentIndex, xml, flags) < 0) { @@ -1235,7 +1234,7 @@ virNetworkObjUpdate(virNetworkObjPtr network, virNetworkDefPtr checkdef; =20 /* work on a copy of the def */ - if (!(configdef =3D virNetworkDefCopy(virNetworkObjGetPersistentDe= f(network), + if (!(configdef =3D virNetworkDefCopy(virNetworkObjGetPersistentDe= f(obj), VIR_NETWORK_XML_INACTIVE))) { goto cleanup; } @@ -1252,14 +1251,14 @@ virNetworkObjUpdate(virNetworkObjPtr network, =20 if (configdef) { /* successfully modified copy, now replace original */ - if (virNetworkObjReplacePersistentDef(network, configdef) < 0) + if (virNetworkObjReplacePersistentDef(obj, configdef) < 0) goto cleanup; configdef =3D NULL; } if (livedef) { /* successfully modified copy, now replace original */ - virNetworkDefFree(network->def); - network->def =3D livedef; + virNetworkDefFree(obj->def); + obj->def =3D livedef; livedef =3D NULL; } =20 @@ -1273,31 +1272,31 @@ virNetworkObjUpdate(virNetworkObjPtr network, =20 #define MATCH(FLAG) (flags & (FLAG)) static bool -virNetworkMatch(virNetworkObjPtr netobj, +virNetworkMatch(virNetworkObjPtr obj, unsigned int flags) { /* filter by active state */ if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE) && !((MATCH(VIR_CONNECT_LIST_NETWORKS_ACTIVE) && - virNetworkObjIsActive(netobj)) || + virNetworkObjIsActive(obj)) || (MATCH(VIR_CONNECT_LIST_NETWORKS_INACTIVE) && - !virNetworkObjIsActive(netobj)))) + !virNetworkObjIsActive(obj)))) return false; =20 /* filter by persistence */ if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT) && !((MATCH(VIR_CONNECT_LIST_NETWORKS_PERSISTENT) && - netobj->persistent) || + obj->persistent) || (MATCH(VIR_CONNECT_LIST_NETWORKS_TRANSIENT) && - !netobj->persistent))) + !obj->persistent))) return false; =20 /* filter by autostart option */ if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART) && !((MATCH(VIR_CONNECT_LIST_NETWORKS_AUTOSTART) && - netobj->autostart) || + obj->autostart) || (MATCH(VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART) && - !netobj->autostart))) + !obj->autostart))) return false; =20 return true; --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list