External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Make a common UUID lookup function from driver

Browse Source 
Rather than separate calls, use a common call and generate a better
error message which includes the incorrect uuidstr.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-04-18 13:47:35 -04:00
parent 6181e404d9
commit 6b73a13212
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/nwfilter/nwfilter_driver.c
View File

@ -356,6 +356,21 @@ nwfilterStateCleanup(void)
}
static virNWFilterObjPtr
nwfilterObjFromNWFilter(const unsigned char *uuid)
{
virNWFilterObjPtr obj;
char uuidstr[VIR_UUID_STRING_BUFLEN];
if (!(obj = virNWFilterObjListFindByUUID(driver->nwfilters, uuid))) {
virUUIDFormat(uuid, uuidstr);
virReportError(VIR_ERR_NO_NWFILTER,
_("no nwfilter with matching uuid '%s'"), uuidstr);
}
return obj;
}
static virNWFilterPtr
nwfilterLookupByUUID(virConnectPtr conn,
const unsigned char *uuid)
@ -365,14 +380,11 @@ nwfilterLookupByUUID(virConnectPtr conn,
virNWFilterPtr ret = NULL;
nwfilterDriverLock();
obj = virNWFilterObjListFindByUUID(driver->nwfilters, uuid);
obj = nwfilterObjFromNWFilter(uuid);
nwfilterDriverUnlock();
if (!obj) {
virReportError(VIR_ERR_NO_NWFILTER,
"%s", _("no nwfilter with matching uuid"));
if (!obj)
goto cleanup;
}
def = virNWFilterObjGetDef(obj);
if (virNWFilterLookupByUUIDEnsureACL(conn, def) < 0)
@ -528,12 +540,8 @@ nwfilterUndefine(virNWFilterPtr nwfilter)
virNWFilterWriteLockFilterUpdates();
virNWFilterCallbackDriversLock();
obj = virNWFilterObjListFindByUUID(driver->nwfilters, nwfilter->uuid);
if (!obj) {
virReportError(VIR_ERR_NO_NWFILTER,
"%s", _("no nwfilter with matching uuid"));
if (!(obj = nwfilterObjFromNWFilter(nwfilter->uuid)))
goto cleanup;
}
def = virNWFilterObjGetDef(obj);
if (virNWFilterUndefineEnsureACL(nwfilter->conn, def) < 0)
@ -575,14 +583,11 @@ nwfilterGetXMLDesc(virNWFilterPtr nwfilter,
virCheckFlags(0, NULL);
nwfilterDriverLock();
obj = virNWFilterObjListFindByUUID(driver->nwfilters, nwfilter->uuid);
obj = nwfilterObjFromNWFilter(nwfilter->uuid);
nwfilterDriverUnlock();
if (!obj) {
virReportError(VIR_ERR_NO_NWFILTER,
"%s", _("no nwfilter with matching uuid"));
if (!obj)
goto cleanup;
}
def = virNWFilterObjGetDef(obj);
if (virNWFilterGetXMLDescEnsureACL(nwfilter->conn, def) < 0)