From ea90e0fbb95399772f4713954d8570224ab4520c Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Fri, 9 Mar 2018 10:37:52 -0500 Subject: [PATCH] test: Use virDomainObjListFindByUUIDRef Rather than using virDomainObjListFindByUUID, let's be more consistent and return a reffed and locked object. Since we're using the Ref API, use virDomainObjEndAPI on @dom and not just virObjectUnlock. Signed-off-by: John Ferlan Reviewed-by: Marc Hartmayer --- src/test/test_driver.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 35ee19bc10..0bfc797400 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1740,16 +1740,14 @@ static virDomainPtr testDomainLookupByUUID(virConnectPtr conn, virDomainPtr ret = NULL; virDomainObjPtr dom; - if (!(dom = virDomainObjListFindByUUID(privconn->domains, uuid))) { + if (!(dom = virDomainObjListFindByUUIDRef(privconn->domains, uuid))) { virReportError(VIR_ERR_NO_DOMAIN, NULL); - goto cleanup; + return NULL; } ret = virGetDomain(conn, dom->def->name, dom->def->uuid, dom->def->id); - cleanup: - if (dom) - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); return ret; } -- GitLab