]> xenbits.xensource.com Git - libvirt.git/commitdiff
test: Use virDomainObjListFindByIDRef
authorJohn Ferlan <jferlan@redhat.com>
Tue, 27 Mar 2018 17:16:38 +0000 (13:16 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 4 Apr 2018 10:53:44 +0000 (06:53 -0400)
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 <jferlan@redhat.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
src/test/test_driver.c

index 0bfc7974005dd6bffffefd3c3b104f490d7e67d8..5e39ae574c914a31e1b5fce40be6f35a75c731f1 100644 (file)
@@ -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;
 }