From 608938419b216abd92fa4ea0ddaaab01d610c735 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Tue, 27 Mar 2018 13:16:38 -0400 Subject: [PATCH] test: Use virDomainObjListFindByIDRef Rather than using virDomainObjListFindByID, 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 0bfc797400..5e39ae574c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1720,16 +1720,14 @@ static virDomainPtr testDomainLookupByID(virConnectPtr conn, virDomainPtr ret = NULL; virDomainObjPtr dom; - if (!(dom = virDomainObjListFindByID(privconn->domains, id))) { + if (!(dom = virDomainObjListFindByIDRef(privconn->domains, id))) { 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