External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: Consistent use of @obj for virnetworkobj

Browse Source 
Consistently use @obj for a virNetworkObjPtr.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-10 07:59:48 -04:00
parent bc9868aaf2
commit 26c8fe4990
1 changed files with 166 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

333
src/conf/virnetworkobj.c
View File

@ -71,39 +71,39 @@ VIR_ONCE_GLOBAL_INIT(virNetworkObj)
virNetworkObjPtr virNetworkObjPtr
virNetworkObjNew(void) virNetworkObjNew(void)
{ {
virNetworkObjPtr net; virNetworkObjPtr obj;
if (virNetworkObjInitialize() < 0) if (virNetworkObjInitialize() < 0)
return NULL; return NULL;
if (!(net = virObjectLockableNew(virNetworkObjClass))) if (!(obj = virObjectLockableNew(virNetworkObjClass)))
return NULL; return NULL;
if (!(net->classIdMap = virBitmapNew(CLASS_ID_BITMAP_SIZE))) if (!(obj->classIdMap = virBitmapNew(CLASS_ID_BITMAP_SIZE)))
goto error; goto error;
/* The first three class IDs are already taken */ /* The first three class IDs are already taken */
ignore_value(virBitmapSetBit(net->classIdMap, 0)); ignore_value(virBitmapSetBit(obj->classIdMap, 0));
ignore_value(virBitmapSetBit(net->classIdMap, 1)); ignore_value(virBitmapSetBit(obj->classIdMap, 1));
ignore_value(virBitmapSetBit(net->classIdMap, 2)); ignore_value(virBitmapSetBit(obj->classIdMap, 2));
return net; return obj;
error: error:
virObjectUnref(net); virObjectUnref(obj);
return NULL; return NULL;
} }
void void
virNetworkObjEndAPI(virNetworkObjPtr *net) virNetworkObjEndAPI(virNetworkObjPtr *obj)
{ {
if (!*net) if (!*obj)
return; return;
virObjectUnlock(*net); virObjectUnlock(*obj);
virObjectUnref(*net); virObjectUnref(*obj);
*net = NULL; *obj = NULL;
} }
@ -327,15 +327,15 @@ static virNetworkObjPtr
virNetworkObjFindByUUIDLocked(virNetworkObjListPtr nets, virNetworkObjFindByUUIDLocked(virNetworkObjListPtr nets,
const unsigned char *uuid) const unsigned char *uuid)
{ {
virNetworkObjPtr ret = NULL; virNetworkObjPtr obj = NULL;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
virUUIDFormat(uuid, uuidstr); virUUIDFormat(uuid, uuidstr);
ret = virHashLookup(nets->objs, uuidstr); obj = virHashLookup(nets->objs, uuidstr);
if (ret) if (obj)
virObjectRef(ret); virObjectRef(obj);
return ret; return obj;
} }
@ -353,14 +353,14 @@ virNetworkObjPtr
virNetworkObjFindByUUID(virNetworkObjListPtr nets, virNetworkObjFindByUUID(virNetworkObjListPtr nets,
const unsigned char *uuid) const unsigned char *uuid)
{ {
virNetworkObjPtr ret; virNetworkObjPtr obj;
virObjectLock(nets); virObjectLock(nets);
ret = virNetworkObjFindByUUIDLocked(nets, uuid); obj = virNetworkObjFindByUUIDLocked(nets, uuid);
virObjectUnlock(nets); virObjectUnlock(nets);
if (ret) if (obj)
virObjectLock(ret); virObjectLock(obj);
return ret; return obj;
} }
@ -369,13 +369,13 @@ virNetworkObjSearchName(const void *payload,
const void *name ATTRIBUTE_UNUSED, const void *name ATTRIBUTE_UNUSED,
const void *data) const void *data)
{ {
virNetworkObjPtr net = (virNetworkObjPtr) payload; virNetworkObjPtr obj = (virNetworkObjPtr) payload;
int want = 0; int want = 0;
virObjectLock(net); virObjectLock(obj);
if (STREQ(net->def->name, (const char *)data)) if (STREQ(obj->def->name, (const char *)data))
want = 1; want = 1;
virObjectUnlock(net); virObjectUnlock(obj);
return want; return want;
} }
@ -384,12 +384,12 @@ static virNetworkObjPtr
virNetworkObjFindByNameLocked(virNetworkObjListPtr nets, virNetworkObjFindByNameLocked(virNetworkObjListPtr nets,
const char *name) const char *name)
{ {
virNetworkObjPtr ret = NULL; virNetworkObjPtr obj = NULL;
ret = virHashSearch(nets->objs, virNetworkObjSearchName, name, NULL); obj = virHashSearch(nets->objs, virNetworkObjSearchName, name, NULL);
if (ret) if (obj)
virObjectRef(ret); virObjectRef(obj);
return ret; return obj;
} }
@ -407,14 +407,14 @@ virNetworkObjPtr
virNetworkObjFindByName(virNetworkObjListPtr nets, virNetworkObjFindByName(virNetworkObjListPtr nets,
const char *name) const char *name)
{ {
virNetworkObjPtr ret; virNetworkObjPtr obj;
virObjectLock(nets); virObjectLock(nets);
ret = virNetworkObjFindByNameLocked(nets, name); obj = virNetworkObjFindByNameLocked(nets, name);
virObjectUnlock(nets); virObjectUnlock(nets);
if (ret) if (obj)
virObjectLock(ret); virObjectLock(obj);
return ret; return obj;
} }
@ -433,21 +433,21 @@ virNetworkObjTaint(virNetworkObjPtr obj,
static void static void
virNetworkObjDispose(void *obj) virNetworkObjDispose(void *opaque)
{ {
virNetworkObjPtr net = obj; virNetworkObjPtr obj = opaque;
virNetworkDefFree(net->def); virNetworkDefFree(obj->def);
virNetworkDefFree(net->newDef); virNetworkDefFree(obj->newDef);
virBitmapFree(net->classIdMap); virBitmapFree(obj->classIdMap);
virObjectUnref(net->macmap); virObjectUnref(obj->macmap);
} }
static void static void
virNetworkObjListDispose(void *obj) virNetworkObjListDispose(void *opaque)
{ {
virNetworkObjListPtr nets = obj; virNetworkObjListPtr nets = opaque;
virHashFree(nets->objs); virHashFree(nets->objs);
} }
@ -470,7 +470,7 @@ virNetworkObjListDispose(void *obj)
* *
*/ */
void void
virNetworkObjUpdateAssignDef(virNetworkObjPtr network, virNetworkObjUpdateAssignDef(virNetworkObjPtr obj,
virNetworkDefPtr def, virNetworkDefPtr def,
bool live) bool live)
{ {
@ -479,38 +479,38 @@ virNetworkObjUpdateAssignDef(virNetworkObjPtr network,
* existing persistent (!live) def to be restored when the * existing persistent (!live) def to be restored when the
* network is destroyed, unless there is one already saved. * network is destroyed, unless there is one already saved.
*/ */
if (network->persistent && !network->newDef) if (obj->persistent && !obj->newDef)
network->newDef = network->def; obj->newDef = obj->def;
else else
virNetworkDefFree(network->def); virNetworkDefFree(obj->def);
network->def = def; obj->def = def;
} else { /* !live */ } else { /* !live */
virNetworkDefFree(network->newDef); virNetworkDefFree(obj->newDef);
if (virNetworkObjIsActive(network)) { if (virNetworkObjIsActive(obj)) {
/* save new configuration to be restored on network /* save new configuration to be restored on network
* shutdown, leaving current live def alone * shutdown, leaving current live def alone
*/ */
network->newDef = def; obj->newDef = def;
} else { /* !live and !active */ } else { /* !live and !active */
if (network->def && !network->persistent) { if (obj->def && !obj->persistent) {
/* network isn't (yet) marked active or persistent, /* network isn't (yet) marked active or persistent,
* but already has a "live" def set. This means we are * but already has a "live" def set. This means we are
* currently setting the persistent def as a part of * currently setting the persistent def as a part of
* the process of starting the network, so we need to * the process of starting the network, so we need to
* preserve the "not yet live" def in network->def. * preserve the "not yet live" def in network->def.
*/ */
network->newDef = def; obj->newDef = def;
} else { } else {
/* either there is no live def set, or this network /* either there is no live def set, or this network
* was already set as persistent, so the proper thing * was already set as persistent, so the proper thing
* is to overwrite network->def. * is to overwrite network->def.
*/ */
network->newDef = NULL; obj->newDef = NULL;
virNetworkDefFree(network->def); virNetworkDefFree(obj->def);
network->def = def; obj->def = def;
} }
} }
network->persistent = !!def; obj->persistent = !!def;
} }
} }
@ -530,65 +530,64 @@ virNetworkObjAssignDefLocked(virNetworkObjListPtr nets,
virNetworkDefPtr def, virNetworkDefPtr def,
unsigned int flags) unsigned int flags)
{ {
virNetworkObjPtr network; virNetworkObjPtr obj;
virNetworkObjPtr ret = NULL; virNetworkObjPtr ret = NULL;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
/* See if a network with matching UUID already exists */ /* See if a network with matching UUID already exists */
if ((network = virNetworkObjFindByUUIDLocked(nets, def->uuid))) { if ((obj = virNetworkObjFindByUUIDLocked(nets, def->uuid))) {
virObjectLock(network); virObjectLock(obj);
/* UUID matches, but if names don't match, refuse it */ /* UUID matches, but if names don't match, refuse it */
if (STRNEQ(network->def->name, def->name)) { if (STRNEQ(obj->def->name, def->name)) {
virUUIDFormat(network->def->uuid, uuidstr); virUUIDFormat(obj->def->uuid, uuidstr);
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("network '%s' is already defined with uuid %s"), _("network '%s' is already defined with uuid %s"),
network->def->name, uuidstr); obj->def->name, uuidstr);
goto cleanup; goto cleanup;
} }
if (flags & VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE) { if (flags & VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE) {
/* UUID & name match, but if network is already active, refuse it */ /* UUID & name match, but if network is already active, refuse it */
if (virNetworkObjIsActive(network)) { if (virNetworkObjIsActive(obj)) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("network is already active as '%s'"), _("network is already active as '%s'"),
network->def->name); obj->def->name);
goto cleanup; goto cleanup;
} }
} }
virNetworkObjUpdateAssignDef(network, virNetworkObjUpdateAssignDef(obj, def,
def,
!!(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE)); !!(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE));
} else { } else {
/* UUID does not match, but if a name matches, refuse it */ /* UUID does not match, but if a name matches, refuse it */
if ((network = virNetworkObjFindByNameLocked(nets, def->name))) { if ((obj = virNetworkObjFindByNameLocked(nets, def->name))) {
virObjectLock(network); virObjectLock(obj);
virUUIDFormat(network->def->uuid, uuidstr); virUUIDFormat(obj->def->uuid, uuidstr);
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("network '%s' already exists with uuid %s"), _("network '%s' already exists with uuid %s"),
def->name, uuidstr); def->name, uuidstr);
goto cleanup; goto cleanup;
} }
if (!(network = virNetworkObjNew())) if (!(obj = virNetworkObjNew()))
goto cleanup; goto cleanup;
virObjectLock(network); virObjectLock(obj);
virUUIDFormat(def->uuid, uuidstr); virUUIDFormat(def->uuid, uuidstr);
if (virHashAddEntry(nets->objs, uuidstr, network) < 0) if (virHashAddEntry(nets->objs, uuidstr, obj) < 0)
goto cleanup; goto cleanup;
network->def = def; obj->def = def;
network->persistent = !(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE); obj->persistent = !(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE);
virObjectRef(network); virObjectRef(obj);
} }
ret = network; ret = obj;
network = NULL; obj = NULL;
cleanup: cleanup:
virNetworkObjEndAPI(&network); virNetworkObjEndAPI(&obj);
return ret; return ret;
} }
@ -613,12 +612,12 @@ virNetworkObjAssignDef(virNetworkObjListPtr nets,
virNetworkDefPtr def, virNetworkDefPtr def,
unsigned int flags) unsigned int flags)
{ {
virNetworkObjPtr network; virNetworkObjPtr obj;
virObjectLock(nets); virObjectLock(nets);
network = virNetworkObjAssignDefLocked(nets, def, flags); obj = virNetworkObjAssignDefLocked(nets, def, flags);
virObjectUnlock(nets); virObjectUnlock(nets);
return network; return obj;
} }
@ -637,17 +636,17 @@ virNetworkObjAssignDef(virNetworkObjListPtr nets,
* Returns 0 on success, -1 on failure * Returns 0 on success, -1 on failure
*/ */
int int
virNetworkObjSetDefTransient(virNetworkObjPtr network, virNetworkObjSetDefTransient(virNetworkObjPtr obj,
bool live) bool live)
{ {
if (!virNetworkObjIsActive(network) && !live) if (!virNetworkObjIsActive(obj) && !live)
return 0; return 0;
if (!network->persistent || network->newDef) if (!obj->persistent || obj->newDef)
return 0; return 0;
network->newDef = virNetworkDefCopy(network->def, VIR_NETWORK_XML_INACTIVE); obj->newDef = virNetworkDefCopy(obj->def, VIR_NETWORK_XML_INACTIVE);
return network->newDef ? 0 : -1; return obj->newDef ? 0 : -1;
} }
@ -656,12 +655,12 @@ virNetworkObjSetDefTransient(virNetworkObjPtr network,
* This *undoes* what virNetworkObjSetDefTransient did. * This *undoes* what virNetworkObjSetDefTransient did.
*/ */
void void
virNetworkObjUnsetDefTransient(virNetworkObjPtr network) virNetworkObjUnsetDefTransient(virNetworkObjPtr obj)
{ {
if (network->newDef) { if (obj->newDef) {
virNetworkDefFree(network->def); virNetworkDefFree(obj->def);
network->def = network->newDef; obj->def = obj->newDef;
network->newDef = NULL; obj->newDef = NULL;
} }
} }
@ -676,12 +675,12 @@ virNetworkObjUnsetDefTransient(virNetworkObjPtr network)
* Returns NULL on error, virNetworkDefPtr on success. * Returns NULL on error, virNetworkDefPtr on success.
*/ */
virNetworkDefPtr virNetworkDefPtr
virNetworkObjGetPersistentDef(virNetworkObjPtr network) virNetworkObjGetPersistentDef(virNetworkObjPtr obj)
{ {
if (network->newDef) if (obj->newDef)
return network->newDef; return obj->newDef;
else else
return network->def; return obj->def;
} }
@ -697,15 +696,15 @@ virNetworkObjGetPersistentDef(virNetworkObjPtr network)
* Returns -1 on error, 0 on success * Returns -1 on error, 0 on success
*/ */
int int
virNetworkObjReplacePersistentDef(virNetworkObjPtr network, virNetworkObjReplacePersistentDef(virNetworkObjPtr obj,
virNetworkDefPtr def) virNetworkDefPtr def)
{ {
if (virNetworkObjIsActive(network)) { if (virNetworkObjIsActive(obj)) {
virNetworkDefFree(network->newDef); virNetworkDefFree(obj->newDef);
network->newDef = def; obj->newDef = def;
} else { } else {
virNetworkDefFree(network->def); virNetworkDefFree(obj->def);
network->def = def; obj->def = def;
} }
return 0; return 0;
} }
@ -723,13 +722,13 @@ virNetworkObjReplacePersistentDef(virNetworkObjPtr network,
* Returns 0 on success, -1 on error. * Returns 0 on success, -1 on error.
*/ */
static int static int
virNetworkObjConfigChangeSetup(virNetworkObjPtr network, virNetworkObjConfigChangeSetup(virNetworkObjPtr obj,
unsigned int flags) unsigned int flags)
{ {
bool isActive; bool isActive;
int ret = -1; int ret = -1;
isActive = virNetworkObjIsActive(network); isActive = virNetworkObjIsActive(obj);
if (!isActive && (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE)) { if (!isActive && (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
@ -738,7 +737,7 @@ virNetworkObjConfigChangeSetup(virNetworkObjPtr network,
} }
if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) {
if (!network->persistent) { if (!obj->persistent) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("cannot change persistent config of a " _("cannot change persistent config of a "
"transient network")); "transient network"));
@ -747,7 +746,7 @@ virNetworkObjConfigChangeSetup(virNetworkObjPtr network,
/* this should already have been done by the driver, but do it /* this should already have been done by the driver, but do it
* anyway just in case. * anyway just in case.
*/ */
if (isActive && (virNetworkObjSetDefTransient(network, false) < 0)) if (isActive && (virNetworkObjSetDefTransient(obj, false) < 0))
goto cleanup; goto cleanup;
} }
@ -759,27 +758,27 @@ virNetworkObjConfigChangeSetup(virNetworkObjPtr network,
void void
virNetworkObjRemoveInactive(virNetworkObjListPtr nets, virNetworkObjRemoveInactive(virNetworkObjListPtr nets,
virNetworkObjPtr net) virNetworkObjPtr obj)
{ {
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
virUUIDFormat(net->def->uuid, uuidstr); virUUIDFormat(obj->def->uuid, uuidstr);
virObjectRef(net); virObjectRef(obj);
virObjectUnlock(net); virObjectUnlock(obj);
virObjectLock(nets); virObjectLock(nets);
virObjectLock(net); virObjectLock(obj);
virHashRemoveEntry(nets->objs, uuidstr); virHashRemoveEntry(nets->objs, uuidstr);
virObjectUnlock(nets); virObjectUnlock(nets);
virObjectUnref(net); virObjectUnref(obj);
} }
static char * static char *
virNetworkObjFormat(virNetworkObjPtr net, virNetworkObjFormat(virNetworkObjPtr obj,
unsigned int flags) unsigned int flags)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
char *classIdStr = virBitmapFormat(net->classIdMap); char *classIdStr = virBitmapFormat(obj->classIdMap);
size_t i; size_t i;
if (!classIdStr) if (!classIdStr)
@ -788,16 +787,16 @@ virNetworkObjFormat(virNetworkObjPtr net,
virBufferAddLit(&buf, "<networkstatus>\n"); virBufferAddLit(&buf, "<networkstatus>\n");
virBufferAdjustIndent(&buf, 2); virBufferAdjustIndent(&buf, 2);
virBufferAsprintf(&buf, "<class_id bitmap='%s'/>\n", classIdStr); virBufferAsprintf(&buf, "<class_id bitmap='%s'/>\n", classIdStr);
virBufferAsprintf(&buf, "<floor sum='%llu'/>\n", net->floor_sum); virBufferAsprintf(&buf, "<floor sum='%llu'/>\n", obj->floor_sum);
VIR_FREE(classIdStr); VIR_FREE(classIdStr);
for (i = 0; i < VIR_NETWORK_TAINT_LAST; i++) { for (i = 0; i < VIR_NETWORK_TAINT_LAST; i++) {
if (net->taint & (1 << i)) if (obj->taint & (1 << i))
virBufferAsprintf(&buf, "<taint flag='%s'/>\n", virBufferAsprintf(&buf, "<taint flag='%s'/>\n",
virNetworkTaintTypeToString(i)); virNetworkTaintTypeToString(i));
} }
if (virNetworkDefFormatBuf(&buf, net->def, flags) < 0) if (virNetworkDefFormatBuf(&buf, obj->def, flags) < 0)
goto error; goto error;
virBufferAdjustIndent(&buf, -2); virBufferAdjustIndent(&buf, -2);
@ -816,16 +815,16 @@ virNetworkObjFormat(virNetworkObjPtr net,
int int
virNetworkObjSaveStatus(const char *statusDir, virNetworkObjSaveStatus(const char *statusDir,
virNetworkObjPtr network) virNetworkObjPtr obj)
{ {
int ret = -1; int ret = -1;
int flags = 0; int flags = 0;
char *xml; char *xml;
if (!(xml = virNetworkObjFormat(network, flags))) if (!(xml = virNetworkObjFormat(obj, flags)))
goto cleanup; goto cleanup;
if (virNetworkSaveXML(statusDir, network->def, xml)) if (virNetworkSaveXML(statusDir, obj->def, xml))
goto cleanup; goto cleanup;
ret = 0; ret = 0;
@ -842,7 +841,7 @@ virNetworkLoadState(virNetworkObjListPtr nets,
{ {
char *configFile = NULL; char *configFile = NULL;
virNetworkDefPtr def = NULL; virNetworkDefPtr def = NULL;
virNetworkObjPtr net = NULL; virNetworkObjPtr obj = NULL;
xmlDocPtr xml = NULL; xmlDocPtr xml = NULL;
xmlNodePtr node = NULL, *nodes = NULL; xmlNodePtr node = NULL, *nodes = NULL;
xmlXPathContextPtr ctxt = NULL; xmlXPathContextPtr ctxt = NULL;
@ -931,28 +930,28 @@ virNetworkLoadState(virNetworkObjListPtr nets,
} }
/* create the object */ /* create the object */
if (!(net = virNetworkObjAssignDef(nets, def, if (!(obj = virNetworkObjAssignDef(nets, def,
VIR_NETWORK_OBJ_LIST_ADD_LIVE))) VIR_NETWORK_OBJ_LIST_ADD_LIVE)))
goto error; goto error;
/* do not put any "goto error" below this comment */ /* do not put any "goto error" below this comment */
/* assign status data stored in the network object */ /* assign status data stored in the network object */
if (classIdMap) { if (classIdMap) {
virBitmapFree(net->classIdMap); virBitmapFree(obj->classIdMap);
net->classIdMap = classIdMap; obj->classIdMap = classIdMap;
} }
if (floor_sum_val > 0) if (floor_sum_val > 0)
net->floor_sum = floor_sum_val; obj->floor_sum = floor_sum_val;
net->taint = taint; obj->taint = taint;
net->active = true; /* any network with a state file is by definition active */ obj->active = true; /* network with a state file is by definition active */
cleanup: cleanup:
VIR_FREE(configFile); VIR_FREE(configFile);
xmlFreeDoc(xml); xmlFreeDoc(xml);
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
return net; return obj;
error: error:
VIR_FREE(nodes); VIR_FREE(nodes);
@ -970,7 +969,7 @@ virNetworkLoadConfig(virNetworkObjListPtr nets,
{ {
char *configFile = NULL, *autostartLink = NULL; char *configFile = NULL, *autostartLink = NULL;
virNetworkDefPtr def = NULL; virNetworkDefPtr def = NULL;
virNetworkObjPtr net; virNetworkObjPtr obj;
int autostart; int autostart;
if ((configFile = virNetworkConfigFile(configDir, name)) == NULL) if ((configFile = virNetworkConfigFile(configDir, name)) == NULL)
@ -1007,15 +1006,15 @@ virNetworkLoadConfig(virNetworkObjListPtr nets,
def->mac_specified = false; def->mac_specified = false;
} }
if (!(net = virNetworkObjAssignDef(nets, def, 0))) if (!(obj = virNetworkObjAssignDef(nets, def, 0)))
goto error; goto error;
net->autostart = (autostart == 1); obj->autostart = (autostart == 1);
VIR_FREE(configFile); VIR_FREE(configFile);
VIR_FREE(autostartLink); VIR_FREE(autostartLink);
return net; return obj;
error: error:
VIR_FREE(configFile); VIR_FREE(configFile);
@ -1038,13 +1037,13 @@ virNetworkObjLoadAllState(virNetworkObjListPtr nets,
return rc; return rc;
while ((ret = virDirRead(dir, &entry, stateDir)) > 0) { while ((ret = virDirRead(dir, &entry, stateDir)) > 0) {
virNetworkObjPtr net; virNetworkObjPtr obj;
if (!virFileStripSuffix(entry->d_name, ".xml")) if (!virFileStripSuffix(entry->d_name, ".xml"))
continue; continue;
net = virNetworkLoadState(nets, stateDir, entry->d_name); obj = virNetworkLoadState(nets, stateDir, entry->d_name);
virNetworkObjEndAPI(&net); virNetworkObjEndAPI(&obj);
} }
VIR_DIR_CLOSE(dir); VIR_DIR_CLOSE(dir);
@ -1066,18 +1065,18 @@ virNetworkObjLoadAllConfigs(virNetworkObjListPtr nets,
return rc; return rc;
while ((ret = virDirRead(dir, &entry, configDir)) > 0) { while ((ret = virDirRead(dir, &entry, configDir)) > 0) {
virNetworkObjPtr net; virNetworkObjPtr obj;
if (!virFileStripSuffix(entry->d_name, ".xml")) if (!virFileStripSuffix(entry->d_name, ".xml"))
continue; continue;
/* NB: ignoring errors, so one malformed config doesn't /* NB: ignoring errors, so one malformed config doesn't
kill the whole process */ kill the whole process */
net = virNetworkLoadConfig(nets, obj = virNetworkLoadConfig(nets,
configDir, configDir,
autostartDir, autostartDir,
entry->d_name); entry->d_name);
virNetworkObjEndAPI(&net); virNetworkObjEndAPI(&obj);
} }
VIR_DIR_CLOSE(dir); VIR_DIR_CLOSE(dir);
@ -1088,20 +1087,20 @@ virNetworkObjLoadAllConfigs(virNetworkObjListPtr nets,
int int
virNetworkObjDeleteConfig(const char *configDir, virNetworkObjDeleteConfig(const char *configDir,
const char *autostartDir, const char *autostartDir,
virNetworkObjPtr net) virNetworkObjPtr obj)
{ {
char *configFile = NULL; char *configFile = NULL;
char *autostartLink = NULL; char *autostartLink = NULL;
int ret = -1; int ret = -1;
if ((configFile = virNetworkConfigFile(configDir, net->def->name)) == NULL) if (!(configFile = virNetworkConfigFile(configDir, obj->def->name)))
goto error; goto error;
if ((autostartLink = virNetworkConfigFile(autostartDir, net->def->name)) == NULL) if (!(autostartLink = virNetworkConfigFile(autostartDir, obj->def->name)))
goto error; goto error;
/* Not fatal if this doesn't work */ /* Not fatal if this doesn't work */
unlink(autostartLink); unlink(autostartLink);
net->autostart = false; obj->autostart = false;
if (unlink(configFile) < 0) { if (unlink(configFile) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
@ -1130,22 +1129,22 @@ virNetworkObjBridgeInUseHelper(const void *payload,
const void *opaque) const void *opaque)
{ {
int ret; int ret;
virNetworkObjPtr net = (virNetworkObjPtr) payload; virNetworkObjPtr obj = (virNetworkObjPtr) payload;
const struct virNetworkObjBridgeInUseHelperData *data = opaque; const struct virNetworkObjBridgeInUseHelperData *data = opaque;
virObjectLock(net); virObjectLock(obj);
if (data->skipname && if (data->skipname &&
((net->def && STREQ(net->def->name, data->skipname)) || ((obj->def && STREQ(obj->def->name, data->skipname)) ||
(net->newDef && STREQ(net->newDef->name, data->skipname)))) (obj->newDef && STREQ(obj->newDef->name, data->skipname))))
ret = 0; ret = 0;
else if ((net->def && net->def->bridge && else if ((obj->def && obj->def->bridge &&
STREQ(net->def->bridge, data->bridge)) || STREQ(obj->def->bridge, data->bridge)) ||
(net->newDef && net->newDef->bridge && (obj->newDef && obj->newDef->bridge &&
STREQ(net->newDef->bridge, data->bridge))) STREQ(obj->newDef->bridge, data->bridge)))
ret = 1; ret = 1;
else else
ret = 0; ret = 0;
virObjectUnlock(net); virObjectUnlock(obj);
return ret; return ret;
} }
@ -1181,7 +1180,7 @@ virNetworkObjBridgeInUse(virNetworkObjListPtr nets,
* Returns: -1 on error, 0 on success. * Returns: -1 on error, 0 on success.
*/ */
int int
virNetworkObjUpdate(virNetworkObjPtr network, virNetworkObjUpdate(virNetworkObjPtr obj,
unsigned int command, /* virNetworkUpdateCommand */ unsigned int command, /* virNetworkUpdateCommand */
unsigned int section, /* virNetworkUpdateSection */ unsigned int section, /* virNetworkUpdateSection */
int parentIndex, int parentIndex,
@ -1192,14 +1191,14 @@ virNetworkObjUpdate(virNetworkObjPtr network,
virNetworkDefPtr livedef = NULL, configdef = NULL; virNetworkDefPtr livedef = NULL, configdef = NULL;
/* normalize config data, and check for common invalid requests. */ /* normalize config data, and check for common invalid requests. */
if (virNetworkObjConfigChangeSetup(network, flags) < 0) if (virNetworkObjConfigChangeSetup(obj, flags) < 0)
goto cleanup; goto cleanup;
if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) { if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) {
virNetworkDefPtr checkdef; virNetworkDefPtr checkdef;
/* work on a copy of the def */ /* work on a copy of the def */
if (!(livedef = virNetworkDefCopy(network->def, 0))) if (!(livedef = virNetworkDefCopy(obj->def, 0)))
goto cleanup; goto cleanup;
if (virNetworkDefUpdateSection(livedef, command, section, if (virNetworkDefUpdateSection(livedef, command, section,
parentIndex, xml, flags) < 0) { parentIndex, xml, flags) < 0) {
@ -1217,7 +1216,7 @@ virNetworkObjUpdate(virNetworkObjPtr network,
virNetworkDefPtr checkdef; virNetworkDefPtr checkdef;
/* work on a copy of the def */ /* work on a copy of the def */
if (!(configdef = virNetworkDefCopy(virNetworkObjGetPersistentDef(network), if (!(configdef = virNetworkDefCopy(virNetworkObjGetPersistentDef(obj),
VIR_NETWORK_XML_INACTIVE))) { VIR_NETWORK_XML_INACTIVE))) {
goto cleanup; goto cleanup;
} }
@ -1234,14 +1233,14 @@ virNetworkObjUpdate(virNetworkObjPtr network,
if (configdef) { if (configdef) {
/* successfully modified copy, now replace original */ /* successfully modified copy, now replace original */
if (virNetworkObjReplacePersistentDef(network, configdef) < 0) if (virNetworkObjReplacePersistentDef(obj, configdef) < 0)
goto cleanup; goto cleanup;
configdef = NULL; configdef = NULL;
} }
if (livedef) { if (livedef) {
/* successfully modified copy, now replace original */ /* successfully modified copy, now replace original */
virNetworkDefFree(network->def); virNetworkDefFree(obj->def);
network->def = livedef; obj->def = livedef;
livedef = NULL; livedef = NULL;
} }
@ -1255,31 +1254,31 @@ virNetworkObjUpdate(virNetworkObjPtr network,
#define MATCH(FLAG) (flags & (FLAG)) #define MATCH(FLAG) (flags & (FLAG))
static bool static bool
virNetworkMatch(virNetworkObjPtr netobj, virNetworkMatch(virNetworkObjPtr obj,
unsigned int flags) unsigned int flags)
{ {
/* filter by active state */ /* filter by active state */
if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE) && if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE) &&
!((MATCH(VIR_CONNECT_LIST_NETWORKS_ACTIVE) && !((MATCH(VIR_CONNECT_LIST_NETWORKS_ACTIVE) &&
virNetworkObjIsActive(netobj)) || virNetworkObjIsActive(obj)) ||
(MATCH(VIR_CONNECT_LIST_NETWORKS_INACTIVE) && (MATCH(VIR_CONNECT_LIST_NETWORKS_INACTIVE) &&
!virNetworkObjIsActive(netobj)))) !virNetworkObjIsActive(obj))))
return false; return false;
/* filter by persistence */ /* filter by persistence */
if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT) && if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT) &&
!((MATCH(VIR_CONNECT_LIST_NETWORKS_PERSISTENT) && !((MATCH(VIR_CONNECT_LIST_NETWORKS_PERSISTENT) &&
netobj->persistent) || obj->persistent) ||
(MATCH(VIR_CONNECT_LIST_NETWORKS_TRANSIENT) && (MATCH(VIR_CONNECT_LIST_NETWORKS_TRANSIENT) &&
!netobj->persistent))) !obj->persistent)))
return false; return false;
/* filter by autostart option */ /* filter by autostart option */
if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART) && if (MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART) &&
!((MATCH(VIR_CONNECT_LIST_NETWORKS_AUTOSTART) && !((MATCH(VIR_CONNECT_LIST_NETWORKS_AUTOSTART) &&
netobj->autostart) || obj->autostart) ||
(MATCH(VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART) && (MATCH(VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART) &&
!netobj->autostart))) !obj->autostart)))
return false; return false;
return true; return true;