From nobody Thu May 2 16:01:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1524229731859141.36046958645397; Fri, 20 Apr 2018 06:08:51 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EBE372820A; Fri, 20 Apr 2018 13:08:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B275B5BD65; Fri, 20 Apr 2018 13:08:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 551B14CAA2; Fri, 20 Apr 2018 13:08:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3KD8kwM029964 for ; Fri, 20 Apr 2018 09:08:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id C639E5EE0A; Fri, 20 Apr 2018 13:08:46 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-116-30.phx2.redhat.com [10.3.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 867045D6A8 for ; Fri, 20 Apr 2018 13:08:46 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Fri, 20 Apr 2018 09:08:35 -0400 Message-Id: <20180420130836.31714-2-jferlan@redhat.com> In-Reply-To: <20180420130836.31714-1-jferlan@redhat.com> References: <20180420130836.31714-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/2] conf: Rework/rename virDomainObjListFindByUUIDRef X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 20 Apr 2018 13:08:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Now that every caller is using virDomainObjListFindByUUIDRef, let's just remove it and keep the name as virDomainObjListFindByUUID. Signed-off-by: John Ferlan Reviewed-by: Jim Fehlig --- src/bhyve/bhyve_driver.c | 4 ++-- src/conf/virdomainobjlist.c | 35 +++++++---------------------------- src/conf/virdomainobjlist.h | 2 -- src/libvirt_private.syms | 1 - src/libxl/libxl_driver.c | 4 ++-- src/lxc/lxc_driver.c | 4 ++-- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/test/test_driver.c | 4 ++-- src/uml/uml_driver.c | 4 ++-- src/util/virclosecallbacks.c | 4 ++-- src/vmware/vmware_driver.c | 2 +- src/vz/vz_driver.c | 4 ++-- src/vz/vz_sdk.c | 14 +++++++------- src/vz/vz_utils.c | 2 +- 15 files changed, 33 insertions(+), 57 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 24c4a9c80e..bd8c6b30ed 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -168,7 +168,7 @@ bhyveDomObjFromDomain(virDomainPtr domain) bhyveConnPtr privconn =3D domain->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - vm =3D virDomainObjListFindByUUIDRef(privconn->domains, domain->uuid); + vm =3D virDomainObjListFindByUUID(privconn->domains, domain->uuid); if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, @@ -791,7 +791,7 @@ bhyveDomainLookupByUUID(virConnectPtr conn, virDomainObjPtr vm; virDomainPtr dom =3D NULL; =20 - vm =3D virDomainObjListFindByUUIDRef(privconn->domains, uuid); + vm =3D virDomainObjListFindByUUID(privconn->domains, uuid); =20 if (!vm) { char uuidstr[VIR_UUID_STRING_BUFLEN]; diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index c09e5e5d2f..02b52465d0 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -149,10 +149,10 @@ virDomainObjListFindByIDRef(virDomainObjListPtr doms, return virDomainObjListFindByIDInternal(doms, id, true); } =20 -static virDomainObjPtr -virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, - const unsigned char *uuid, - bool ref) + +virDomainObjPtr +virDomainObjListFindByUUID(virDomainObjListPtr doms, + const unsigned char *uuid) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainObjPtr obj; @@ -161,41 +161,20 @@ virDomainObjListFindByUUIDInternal(virDomainObjListPt= r doms, virUUIDFormat(uuid, uuidstr); =20 obj =3D virHashLookup(doms->objs, uuidstr); - if (ref) { - virObjectRef(obj); - virObjectRWUnlock(doms); - } + virObjectRef(obj); + virObjectRWUnlock(doms); if (obj) { virObjectLock(obj); if (obj->removing) { virObjectUnlock(obj); - if (ref) - virObjectUnref(obj); + virObjectUnref(obj); obj =3D NULL; } } - if (!ref) - virObjectRWUnlock(doms); return obj; } =20 =20 -virDomainObjPtr -virDomainObjListFindByUUID(virDomainObjListPtr doms, - const unsigned char *uuid) -{ - return virDomainObjListFindByUUIDInternal(doms, uuid, false); -} - - -virDomainObjPtr -virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, - const unsigned char *uuid) -{ - return virDomainObjListFindByUUIDInternal(doms, uuid, true); -} - - virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, const char *name) { diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h index bb186bde30..1b77a95ba9 100644 --- a/src/conf/virdomainobjlist.h +++ b/src/conf/virdomainobjlist.h @@ -38,8 +38,6 @@ virDomainObjPtr virDomainObjListFindByIDRef(virDomainObjL= istPtr doms, int id); virDomainObjPtr virDomainObjListFindByUUID(virDomainObjListPtr doms, const unsigned char *uuid); -virDomainObjPtr virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, - const unsigned char *uuid); virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, const char *name); =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b31f599bd2..f6c76d4341 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -955,7 +955,6 @@ virDomainObjListFindByID; virDomainObjListFindByIDRef; virDomainObjListFindByName; virDomainObjListFindByUUID; -virDomainObjListFindByUUIDRef; virDomainObjListForEach; virDomainObjListGetActiveIDs; virDomainObjListGetInactiveNames; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index b66a1de5f1..24553c7272 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -313,7 +313,7 @@ libxlDomObjFromDomain(virDomainPtr dom) libxlDriverPrivatePtr driver =3D dom->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - vm =3D virDomainObjListFindByUUIDRef(driver->domains, dom->uuid); + vm =3D virDomainObjListFindByUUID(driver->domains, dom->uuid); if (!vm) { virUUIDFormat(dom->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, @@ -1105,7 +1105,7 @@ libxlDomainLookupByUUID(virConnectPtr conn, const uns= igned char *uuid) virDomainObjPtr vm; virDomainPtr dom =3D NULL; =20 - vm =3D virDomainObjListFindByUUIDRef(driver->domains, uuid); + vm =3D virDomainObjListFindByUUID(driver->domains, uuid); if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, NULL); goto cleanup; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4097cef934..8773a3fd45 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -138,7 +138,7 @@ lxcDomObjFromDomain(virDomainPtr domain) virLXCDriverPtr driver =3D domain->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - vm =3D virDomainObjListFindByUUIDRef(driver->domains, domain->uuid); + vm =3D virDomainObjListFindByUUID(driver->domains, domain->uuid); if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, @@ -274,7 +274,7 @@ static virDomainPtr lxcDomainLookupByUUID(virConnectPtr= conn, virDomainObjPtr vm; virDomainPtr dom =3D NULL; =20 - vm =3D virDomainObjListFindByUUIDRef(driver->domains, uuid); + vm =3D virDomainObjListFindByUUID(driver->domains, uuid); =20 if (!vm) { char uuidstr[VIR_UUID_STRING_BUFLEN]; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index ba5ad8eeb4..f5a5526d28 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -95,7 +95,7 @@ openvzDomObjFromDomainLocked(struct openvz_driver *driver, virDomainObjPtr vm; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - if (!(vm =3D virDomainObjListFindByUUIDRef(driver->domains, uuid))) { + if (!(vm =3D virDomainObjListFindByUUID(driver->domains, uuid))) { virUUIDFormat(uuid, uuidstr); =20 virReportError(VIR_ERR_NO_DOMAIN, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5673d9fd8d..8a5b049296 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -203,7 +203,7 @@ qemuDomObjFromDomain(virDomainPtr domain) virQEMUDriverPtr driver =3D domain->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - vm =3D virDomainObjListFindByUUIDRef(driver->domains, domain->uuid); + vm =3D virDomainObjListFindByUUID(driver->domains, domain->uuid); if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, @@ -1555,7 +1555,7 @@ static virDomainPtr qemuDomainLookupByUUID(virConnect= Ptr conn, virDomainObjPtr vm; virDomainPtr dom =3D NULL; =20 - vm =3D virDomainObjListFindByUUIDRef(driver->domains, uuid); + vm =3D virDomainObjListFindByUUID(driver->domains, uuid); =20 if (!vm) { char uuidstr[VIR_UUID_STRING_BUFLEN]; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 3560c76fa5..249932de06 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -578,7 +578,7 @@ testDomObjFromDomain(virDomainPtr domain) testDriverPtr driver =3D domain->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - vm =3D virDomainObjListFindByUUIDRef(driver->domains, domain->uuid); + vm =3D virDomainObjListFindByUUID(driver->domains, domain->uuid); if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, @@ -1726,7 +1726,7 @@ static virDomainPtr testDomainLookupByUUID(virConnect= Ptr conn, virDomainPtr ret =3D NULL; virDomainObjPtr dom; =20 - if (!(dom =3D virDomainObjListFindByUUIDRef(privconn->domains, uuid)))= { + if (!(dom =3D virDomainObjListFindByUUID(privconn->domains, uuid))) { virReportError(VIR_ERR_NO_DOMAIN, NULL); return NULL; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 5b941f1dd8..0bafd0902e 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -171,7 +171,7 @@ umlDomObjFromDomainLocked(struct uml_driver *driver, virDomainObjPtr vm; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - if (!(vm =3D virDomainObjListFindByUUIDRef(driver->domains, uuid))) { + if (!(vm =3D virDomainObjListFindByUUID(driver->domains, uuid))) { virUUIDFormat(uuid, uuidstr); =20 virReportError(VIR_ERR_NO_DOMAIN, @@ -773,7 +773,7 @@ static int umlProcessAutoDestroyDom(void *payload, return 0; } =20 - if (!(dom =3D virDomainObjListFindByUUIDRef(data->driver->domains, uui= d))) { + if (!(dom =3D virDomainObjListFindByUUID(data->driver->domains, uuid))= ) { VIR_DEBUG("No domain object to kill"); return 0; } diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c index 0a395eb167..60070dc8d9 100644 --- a/src/util/virclosecallbacks.c +++ b/src/util/virclosecallbacks.c @@ -342,8 +342,8 @@ virCloseCallbacksRun(virCloseCallbacksPtr closeCallback= s, virDomainObjPtr vm; =20 /* Grab a ref and lock to the vm */ - if (!(vm =3D virDomainObjListFindByUUIDRef(domains, - list->entries[i].uuid))) { + if (!(vm =3D virDomainObjListFindByUUID(domains, + list->entries[i].uuid))) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(list->entries[i].uuid, uuidstr); VIR_DEBUG("No domain object with UUID %s", uuidstr); diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index f36fcc60a9..f94d192fd1 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -67,7 +67,7 @@ vmwareDomObjFromDomainLocked(struct vmware_driver *driver, virDomainObjPtr vm; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - if (!(vm =3D virDomainObjListFindByUUIDRef(driver->domains, uuid))) { + if (!(vm =3D virDomainObjListFindByUUID(driver->domains, uuid))) { virUUIDFormat(uuid, uuidstr); =20 virReportError(VIR_ERR_NO_DOMAIN, diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 2f1e00f420..8f8720a037 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -579,7 +579,7 @@ vzDomainLookupByUUID(virConnectPtr conn, const unsigned= char *uuid) virDomainPtr ret =3D NULL; virDomainObjPtr dom; =20 - dom =3D virDomainObjListFindByUUIDRef(privconn->driver->domains, uuid); + dom =3D virDomainObjListFindByUUID(privconn->driver->domains, uuid); =20 if (dom =3D=3D NULL) { char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -814,7 +814,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *= xml, unsigned int flags) if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) goto cleanup; =20 - dom =3D virDomainObjListFindByUUIDRef(driver->domains, def->uuid); + dom =3D virDomainObjListFindByUUID(driver->domains, def->uuid); if (dom =3D=3D NULL) { virResetLastError(); if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) { diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 871ad843e2..bb8f15e4fe 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1958,7 +1958,7 @@ prlsdkLoadDomain(vzDriverPtr driver, goto error; =20 virObjectLock(driver); - if (!(olddom =3D virDomainObjListFindByUUIDRef(driver->domains, de= f->uuid))) + if (!(olddom =3D virDomainObjListFindByUUID(driver->domains, def->= uuid))) dom =3D virDomainObjListAdd(driver->domains, def, driver->xmlo= pt, 0, NULL); virObjectUnlock(driver); =20 @@ -2144,7 +2144,7 @@ prlsdkHandleVmStateEvent(vzDriverPtr driver, virDomainEventType lvEventType =3D 0; int lvEventTypeDetails =3D 0; =20 - dom =3D virDomainObjListFindByUUIDRef(driver->domains, uuid); + dom =3D virDomainObjListFindByUUID(driver->domains, uuid); if (dom =3D=3D NULL) return; =20 @@ -2177,7 +2177,7 @@ prlsdkHandleVmConfigEvent(vzDriverPtr driver, virDomainObjPtr dom =3D NULL; bool job =3D false; =20 - dom =3D virDomainObjListFindByUUIDRef(driver->domains, uuid); + dom =3D virDomainObjListFindByUUID(driver->domains, uuid); if (dom =3D=3D NULL) return; =20 @@ -2207,7 +2207,7 @@ prlsdkHandleVmAddedEvent(vzDriverPtr driver, { virDomainObjPtr dom =3D NULL; =20 - if (!(dom =3D virDomainObjListFindByUUIDRef(driver->domains, uuid)) && + if (!(dom =3D virDomainObjListFindByUUID(driver->domains, uuid)) && !(dom =3D prlsdkAddDomainByUUID(driver, uuid))) goto cleanup; =20 @@ -2225,7 +2225,7 @@ prlsdkHandleVmRemovedEvent(vzDriverPtr driver, { virDomainObjPtr dom =3D NULL; =20 - dom =3D virDomainObjListFindByUUIDRef(driver->domains, uuid); + dom =3D virDomainObjListFindByUUID(driver->domains, uuid); /* domain was removed from the list from the libvirt * API function in current connection */ if (dom =3D=3D NULL) @@ -2248,7 +2248,7 @@ prlsdkHandlePerfEvent(vzDriverPtr driver, virDomainObjPtr dom =3D NULL; vzDomObjPtr privdom =3D NULL; =20 - if (!(dom =3D virDomainObjListFindByUUIDRef(driver->domains, uuid))) { + if (!(dom =3D virDomainObjListFindByUUID(driver->domains, uuid))) { PrlHandle_Free(event); return; } @@ -2271,7 +2271,7 @@ prlsdkHandleMigrationProgress(vzDriverPtr driver, PRL_HANDLE param =3D PRL_INVALID_HANDLE; PRL_RESULT pret; =20 - if (!(dom =3D virDomainObjListFindByUUIDRef(driver->domains, uuid))) + if (!(dom =3D virDomainObjListFindByUUID(driver->domains, uuid))) return; =20 pret =3D PrlEvent_GetParam(event, 0, ¶m); diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 8f4e3e3474..13f5deeaa5 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -76,7 +76,7 @@ vzDomObjFromDomain(virDomainPtr domain) char uuidstr[VIR_UUID_STRING_BUFLEN]; vzDriverPtr driver =3D privconn->driver; =20 - vm =3D virDomainObjListFindByUUIDRef(driver->domains, domain->uuid); + vm =3D virDomainObjListFindByUUID(driver->domains, domain->uuid); if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 16:01:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1524229735823572.7994800726785; Fri, 20 Apr 2018 06:08:55 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D0E5F4E90A; Fri, 20 Apr 2018 13:08:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 930548319B; Fri, 20 Apr 2018 13:08:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 00971180005A; Fri, 20 Apr 2018 13:08:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3KD8l8t029970 for ; Fri, 20 Apr 2018 09:08:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 375095BD65; Fri, 20 Apr 2018 13:08:47 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-116-30.phx2.redhat.com [10.3.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC3BF5D6A8 for ; Fri, 20 Apr 2018 13:08:46 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Fri, 20 Apr 2018 09:08:36 -0400 Message-Id: <20180420130836.31714-3-jferlan@redhat.com> In-Reply-To: <20180420130836.31714-1-jferlan@redhat.com> References: <20180420130836.31714-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/2] conf: Rework/rename virDomainObjListFindByIDRef X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 20 Apr 2018 13:08:54 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rework the code such that virDomainObjListFindByID will always return a locked/ref counted object so that the callers can always do the same cleanup logic to call virDomainObjEndAPI. Makes accessing the objects much more consistent. NB: There were 2 callers (lxcDomainLookupByID and qemuDomainLookupByID) that were already using the ByID name, but not virDomainObjEndAPI - these were changed as well in this update/patch. Signed-off-by: John Ferlan Reviewed-by: Jim Fehlig --- src/bhyve/bhyve_driver.c | 2 +- src/conf/virdomainobjlist.c | 35 +++++++++-------------------------- src/conf/virdomainobjlist.h | 2 -- src/libvirt_private.syms | 1 - src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 3 +-- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_driver.c | 5 ++--- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 13 files changed, 20 insertions(+), 42 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index bd8c6b30ed..768578a43f 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -844,7 +844,7 @@ bhyveDomainLookupByID(virConnectPtr conn, virDomainObjPtr vm; virDomainPtr dom =3D NULL; =20 - vm =3D virDomainObjListFindByIDRef(privconn->domains, id); + vm =3D virDomainObjListFindByID(privconn->domains, id); =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 02b52465d0..d57ed10a5f 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -109,44 +109,27 @@ static int virDomainObjListSearchID(const void *paylo= ad, return want; } =20 -static virDomainObjPtr -virDomainObjListFindByIDInternal(virDomainObjListPtr doms, - int id, - bool ref) + +virDomainObjPtr +virDomainObjListFindByID(virDomainObjListPtr doms, + int id) { virDomainObjPtr obj; + virObjectRWLockRead(doms); obj =3D virHashSearch(doms->objs, virDomainObjListSearchID, &id, NULL); - if (ref) { - virObjectRef(obj); - virObjectRWUnlock(doms); - } + virObjectRef(obj); + virObjectRWUnlock(doms); if (obj) { virObjectLock(obj); if (obj->removing) { virObjectUnlock(obj); - if (ref) - virObjectUnref(obj); + virObjectUnref(obj); obj =3D NULL; } } - if (!ref) - virObjectRWUnlock(doms); - return obj; -} - -virDomainObjPtr -virDomainObjListFindByID(virDomainObjListPtr doms, - int id) -{ - return virDomainObjListFindByIDInternal(doms, id, false); -} =20 -virDomainObjPtr -virDomainObjListFindByIDRef(virDomainObjListPtr doms, - int id) -{ - return virDomainObjListFindByIDInternal(doms, id, true); + return obj; } =20 =20 diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h index 1b77a95ba9..7e2dece3aa 100644 --- a/src/conf/virdomainobjlist.h +++ b/src/conf/virdomainobjlist.h @@ -34,8 +34,6 @@ virDomainObjListPtr virDomainObjListNew(void); =20 virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, int id); -virDomainObjPtr virDomainObjListFindByIDRef(virDomainObjListPtr doms, - int id); virDomainObjPtr virDomainObjListFindByUUID(virDomainObjListPtr doms, const unsigned char *uuid); virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f6c76d4341..d2728749fb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -952,7 +952,6 @@ virDomainObjListCollect; virDomainObjListConvert; virDomainObjListExport; virDomainObjListFindByID; -virDomainObjListFindByIDRef; virDomainObjListFindByName; virDomainObjListFindByUUID; virDomainObjListForEach; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index e401327df4..d4859d6707 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -450,7 +450,7 @@ libxlDomainShutdownThread(void *opaque) =20 cfg =3D libxlDriverConfigGet(driver); =20 - vm =3D virDomainObjListFindByIDRef(driver->domains, ev->domid); + vm =3D virDomainObjListFindByID(driver->domains, ev->domid); if (!vm) { VIR_INFO("Received event for unknown domain ID %d", ev->domid); goto cleanup; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 24553c7272..55a93a489b 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1082,7 +1082,7 @@ libxlDomainLookupByID(virConnectPtr conn, int id) virDomainObjPtr vm; virDomainPtr dom =3D NULL; =20 - vm =3D virDomainObjListFindByIDRef(driver->domains, id); + vm =3D virDomainObjListFindByID(driver->domains, id); if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, NULL); goto cleanup; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8773a3fd45..ca01d369d5 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -262,8 +262,7 @@ static virDomainPtr lxcDomainLookupByID(virConnectPtr c= onn, dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return dom; } =20 diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index f5a5526d28..c10d6df663 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -342,7 +342,7 @@ static virDomainPtr openvzDomainLookupByID(virConnectPt= r conn, virDomainPtr dom =3D NULL; =20 openvzDriverLock(driver); - vm =3D virDomainObjListFindByIDRef(driver->domains, id); + vm =3D virDomainObjListFindByID(driver->domains, id); openvzDriverUnlock(driver); =20 if (!vm) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8a5b049296..7484b00e23 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1529,7 +1529,7 @@ static virDomainPtr qemuDomainLookupByID(virConnectPt= r conn, virDomainObjPtr vm; virDomainPtr dom =3D NULL; =20 - vm =3D virDomainObjListFindByID(driver->domains, id); + vm =3D virDomainObjListFindByID(driver->domains, id); =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, @@ -1543,8 +1543,7 @@ static virDomainPtr qemuDomainLookupByID(virConnectPt= r conn, dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return dom; } =20 diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 249932de06..a1888c0c9f 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1708,7 +1708,7 @@ static virDomainPtr testDomainLookupByID(virConnectPt= r conn, virDomainPtr ret =3D NULL; virDomainObjPtr dom; =20 - if (!(dom =3D virDomainObjListFindByIDRef(privconn->domains, id))) { + if (!(dom =3D virDomainObjListFindByID(privconn->domains, id))) { virReportError(VIR_ERR_NO_DOMAIN, NULL); return NULL; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 0bafd0902e..b50ba1ba64 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1379,7 +1379,7 @@ static virDomainPtr umlDomainLookupByID(virConnectPtr= conn, virDomainPtr dom =3D NULL; =20 umlDriverLock(driver); - vm =3D virDomainObjListFindByIDRef(driver->domains, id); + vm =3D virDomainObjListFindByID(driver->domains, id); umlDriverUnlock(driver); =20 if (!vm) { diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index f94d192fd1..21c10b6605 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -825,7 +825,7 @@ vmwareDomainLookupByID(virConnectPtr conn, int id) virDomainPtr dom =3D NULL; =20 vmwareDriverLock(driver); - vm =3D virDomainObjListFindByIDRef(driver->domains, id); + vm =3D virDomainObjListFindByID(driver->domains, id); vmwareDriverUnlock(driver); =20 if (!vm) { diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 8f8720a037..d3fcae491a 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -555,7 +555,7 @@ vzDomainLookupByID(virConnectPtr conn, int id) virDomainPtr ret =3D NULL; virDomainObjPtr dom; =20 - dom =3D virDomainObjListFindByIDRef(privconn->driver->domains, id); + dom =3D virDomainObjListFindByID(privconn->driver->domains, id); =20 if (dom =3D=3D NULL) { virReportError(VIR_ERR_NO_DOMAIN, NULL); --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list