External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

bhyve: Use virDomainObjListFindBy{UUID|ID}Ref

Browse Source 
For bhyveDomObjFromDomain, bhyveDomainLookupByUUID, and
bhyveDomainLookupByID let's return a locked and referenced
@vm object so that callers can then use the common and more
consistent virDomainObjEndAPI in order to handle cleanup rather
than needing to know that the returned object is locked and
calling virObjectUnlock.

The LookupByName already returns the ref counted and locked object,
so this will make things more consistent.

For bhyveDomainUndefine and bhyveDomainDestroy since the
virDomainObjListRemove will return an unlocked object, we need to
relock before making the EndAPI call.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-10-23 11:00:42 -04:00
parent 550950e5b3
commit f52d0d42c9
1 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/bhyve/bhyve_driver.c
View File

@ -168,7 +168,7 @@ bhyveDomObjFromDomain(virDomainPtr domain)
bhyveConnPtr privconn = domain->conn->privateData; bhyveConnPtr privconn = domain->conn->privateData;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
vm = virDomainObjListFindByUUID(privconn->domains, domain->uuid); vm = virDomainObjListFindByUUIDRef(privconn->domains, domain->uuid);
if (!vm) { if (!vm) {
virUUIDFormat(domain->uuid, uuidstr); virUUIDFormat(domain->uuid, uuidstr);
virReportError(VIR_ERR_NO_DOMAIN, virReportError(VIR_ERR_NO_DOMAIN,
@ -312,8 +312,7 @@ bhyveDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
ret = 0; ret = 0;
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return ret; return ret;
} }
@ -338,8 +337,7 @@ bhyveDomainGetState(virDomainPtr domain,
ret = 0; ret = 0;
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return ret; return ret;
} }
@ -359,8 +357,7 @@ bhyveDomainGetAutostart(virDomainPtr domain, int *autostart)
ret = 0; ret = 0;
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return ret; return ret;
} }
@ -423,8 +420,7 @@ bhyveDomainSetAutostart(virDomainPtr domain, int autostart)
cleanup: cleanup:
VIR_FREE(configFile); VIR_FREE(configFile);
VIR_FREE(autostartLink); VIR_FREE(autostartLink);
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return ret; return ret;
} }
@ -443,8 +439,7 @@ bhyveDomainIsActive(virDomainPtr domain)
ret = virDomainObjIsActive(obj); ret = virDomainObjIsActive(obj);
cleanup: cleanup:
if (obj) virDomainObjEndAPI(&obj);
virObjectUnlock(obj);
return ret; return ret;
} }
@ -463,8 +458,7 @@ bhyveDomainIsPersistent(virDomainPtr domain)
ret = obj->persistent; ret = obj->persistent;
cleanup: cleanup:
if (obj) virDomainObjEndAPI(&obj);
virObjectUnlock(obj);
return ret; return ret;
} }
@ -484,8 +478,7 @@ bhyveDomainGetOSType(virDomainPtr dom)
goto cleanup; goto cleanup;
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return ret; return ret;
} }
@ -512,8 +505,7 @@ bhyveDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
virObjectUnref(caps); virObjectUnref(caps);
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return ret; return ret;
} }
@ -624,14 +616,13 @@ bhyveDomainUndefine(virDomainPtr domain)
vm->persistent = 0; vm->persistent = 0;
} else { } else {
virDomainObjListRemove(privconn->domains, vm); virDomainObjListRemove(privconn->domains, vm);
vm = NULL; virObjectLock(vm);
} }
ret = 0; ret = 0;
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
if (event) if (event)
virObjectEventStateQueue(privconn->domainEventState, event); virObjectEventStateQueue(privconn->domainEventState, event);
return ret; return ret;
@ -803,7 +794,7 @@ bhyveDomainLookupByUUID(virConnectPtr conn,
virDomainObjPtr vm; virDomainObjPtr vm;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
vm = virDomainObjListFindByUUID(privconn->domains, uuid); vm = virDomainObjListFindByUUIDRef(privconn->domains, uuid);
if (!vm) { if (!vm) {
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
@ -819,8 +810,7 @@ bhyveDomainLookupByUUID(virConnectPtr conn,
dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id);
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return dom; return dom;
} }
@ -857,7 +847,7 @@ bhyveDomainLookupByID(virConnectPtr conn,
virDomainObjPtr vm; virDomainObjPtr vm;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
vm = virDomainObjListFindByID(privconn->domains, id); vm = virDomainObjListFindByIDRef(privconn->domains, id);
if (!vm) { if (!vm) {
virReportError(VIR_ERR_NO_DOMAIN, virReportError(VIR_ERR_NO_DOMAIN,
@ -871,8 +861,7 @@ bhyveDomainLookupByID(virConnectPtr conn,
dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id);
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return dom; return dom;
} }
@ -913,8 +902,7 @@ bhyveDomainCreateWithFlags(virDomainPtr dom,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
if (event) if (event)
virObjectEventStateQueue(privconn->domainEventState, event); virObjectEventStateQueue(privconn->domainEventState, event);
return ret; return ret;
@ -1024,12 +1012,11 @@ bhyveDomainDestroy(virDomainPtr dom)
if (!vm->persistent) { if (!vm->persistent) {
virDomainObjListRemove(privconn->domains, vm); virDomainObjListRemove(privconn->domains, vm);
vm = NULL; virObjectLock(vm);
} }
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
if (event) if (event)
virObjectEventStateQueue(privconn->domainEventState, event); virObjectEventStateQueue(privconn->domainEventState, event);
return ret; return ret;
@ -1056,8 +1043,7 @@ bhyveDomainShutdown(virDomainPtr dom)
ret = virBhyveProcessShutdown(vm); ret = virBhyveProcessShutdown(vm);
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return ret; return ret;
} }
@ -1100,8 +1086,7 @@ bhyveDomainOpenConsole(virDomainPtr dom,
ret = 0; ret = 0;
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return ret; return ret;
} }
@ -1143,7 +1128,7 @@ bhyveDomainSetMetadata(virDomainPtr dom,
cleanup: cleanup:
virObjectUnref(caps); virObjectUnref(caps);
virObjectUnlock(vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }
@ -1165,7 +1150,7 @@ bhyveDomainGetMetadata(virDomainPtr dom,
ret = virDomainObjGetMetadata(vm, type, uri, flags); ret = virDomainObjGetMetadata(vm, type, uri, flags);
cleanup: cleanup:
virObjectUnlock(vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }
@ -1548,8 +1533,7 @@ bhyveDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags)
ret = 0; ret = 0;
cleanup: cleanup:
if (vm) virDomainObjEndAPI(&vm);
virObjectUnlock(vm);
return ret; return ret;
} }