From nobody Sun Feb 8 13:27:53 2026 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 1535357361628461.05998484687393; Mon, 27 Aug 2018 01:09:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9CE9E86674; Mon, 27 Aug 2018 08:09:19 +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 E9D45A1F32; Mon, 27 Aug 2018 08:09:18 +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 7ABDE4A471; Mon, 27 Aug 2018 08:09:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7R891P4032486 for ; Mon, 27 Aug 2018 04:09:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E0452027056; Mon, 27 Aug 2018 08:09:01 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-81.brq.redhat.com [10.40.204.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1A76202704E for ; Mon, 27 Aug 2018 08:09:00 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 27 Aug 2018 10:08:28 +0200 Message-Id: <18dc1cf41e079eaa83c4fa515ce232d3f195e758.1535356707.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 15/28] locking: Introduce virLockManagerClearResources 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.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 27 Aug 2018 08:09:20 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is a counterpart to virLockManagerAddResource. It is going to be handy when using one lock manager to lock multiple files step by step. Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan --- src/libvirt_private.syms | 1 + src/locking/lock_driver.h | 5 +++++ src/locking/lock_driver_lockd.c | 27 ++++++++++++++++++++++++++- src/locking/lock_driver_nop.c | 6 ++++++ src/locking/lock_manager.c | 12 ++++++++++++ src/locking/lock_manager.h | 3 +++ 6 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 47ea35f864..42f15f117e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1293,6 +1293,7 @@ virDomainLockProcessStart; # locking/lock_manager.h virLockManagerAcquire; virLockManagerAddResource; +virLockManagerClearResources; virLockManagerFree; virLockManagerInquire; virLockManagerNew; diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h index 9be0abcfba..59c4c3aac7 100644 --- a/src/locking/lock_driver.h +++ b/src/locking/lock_driver.h @@ -228,6 +228,10 @@ typedef int (*virLockDriverAddResource)(virLockManager= Ptr man, virLockManagerParamPtr params, unsigned int flags); =20 + +typedef int (*virLockDriverClearResource)(virLockManagerPtr mgr, + unsigned int flags); + /** * virLockDriverAcquire: * @manager: the lock manager context @@ -313,6 +317,7 @@ struct _virLockDriver { virLockDriverFree drvFree; =20 virLockDriverAddResource drvAddResource; + virLockDriverClearResource drvClearResources; =20 virLockDriverAcquire drvAcquire; virLockDriverRelease drvRelease; diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index d7cb183d7a..4883e89ac6 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -402,8 +402,9 @@ static int virLockManagerLockDaemonDeinit(void) return 0; } =20 + static void -virLockManagerLockDaemonPrivateFree(virLockManagerLockDaemonPrivatePtr pri= v) +virLockManagerLockDaemonFreeResources(virLockManagerLockDaemonPrivatePtr p= riv) { size_t i; =20 @@ -415,6 +416,17 @@ virLockManagerLockDaemonPrivateFree(virLockManagerLock= DaemonPrivatePtr priv) VIR_FREE(priv->resources[i].name); } VIR_FREE(priv->resources); + priv->nresources =3D 0; +} + + +static void +virLockManagerLockDaemonPrivateFree(virLockManagerLockDaemonPrivatePtr pri= v) +{ + if (!priv) + return; + + virLockManagerLockDaemonFreeResources(priv); =20 switch (priv->type) { case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN: @@ -733,6 +745,18 @@ static int virLockManagerLockDaemonAddResource(virLock= ManagerPtr lock, } =20 =20 +static int virLockManagerLockDaemonClearResources(virLockManagerPtr lock, + unsigned int flags) +{ + virLockManagerLockDaemonPrivatePtr priv =3D lock->privateData; + + virCheckFlags(0, -1); + + virLockManagerLockDaemonFreeResources(priv); + return 0; +} + + static int virLockManagerLockDaemonAcquire(virLockManagerPtr lock, const char *state ATTRIBUTE_UNU= SED, unsigned int flags, @@ -881,6 +905,7 @@ virLockDriver virLockDriverImpl =3D .drvFree =3D virLockManagerLockDaemonFree, =20 .drvAddResource =3D virLockManagerLockDaemonAddResource, + .drvClearResources =3D virLockManagerLockDaemonClearResources, =20 .drvAcquire =3D virLockManagerLockDaemonAcquire, .drvRelease =3D virLockManagerLockDaemonRelease, diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index b5eb2952e9..26b36061fb 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -67,6 +67,11 @@ static int virLockManagerNopAddResource(virLockManagerPt= r lock ATTRIBUTE_UNUSED, return 0; } =20 +static int virLockManagerNopClearResources(virLockManagerPtr lock ATTRIBUT= E_UNUSED, + unsigned int flags_unused ATTRI= BUTE_UNUSED) +{ + return 0; +} =20 static int virLockManagerNopAcquire(virLockManagerPtr lock ATTRIBUTE_UNUSE= D, const char *state ATTRIBUTE_UNUSED, @@ -113,6 +118,7 @@ virLockDriver virLockDriverNop =3D .drvFree =3D virLockManagerNopFree, =20 .drvAddResource =3D virLockManagerNopAddResource, + .drvClearResources =3D virLockManagerNopClearResources, =20 .drvAcquire =3D virLockManagerNopAcquire, .drvRelease =3D virLockManagerNopRelease, diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 4ef9f9e692..292b142c14 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -340,6 +340,18 @@ int virLockManagerAddResource(virLockManagerPtr lock, flags); } =20 + +int virLockManagerClearResources(virLockManagerPtr lock, + unsigned int flags) +{ + VIR_DEBUG("lock=3D%p flags=3D0X%x", lock, flags); + + CHECK_MANAGER(drvClearResources, -1); + + return lock->driver->drvClearResources(lock, flags); +} + + int virLockManagerAcquire(virLockManagerPtr lock, const char *state, unsigned int flags, diff --git a/src/locking/lock_manager.h b/src/locking/lock_manager.h index 418975976c..8e0049ce0b 100644 --- a/src/locking/lock_manager.h +++ b/src/locking/lock_manager.h @@ -53,6 +53,9 @@ int virLockManagerAddResource(virLockManagerPtr manager, virLockManagerParamPtr params, unsigned int flags); =20 +int virLockManagerClearResources(virLockManagerPtr lock, + unsigned int flags); + int virLockManagerAcquire(virLockManagerPtr manager, const char *state, unsigned int flags, --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list