virnwfilterobj: Don't use virObjectLockGuard() with virNWFilterObj

[PATCH] virnwfilterobj: Don't use virObjectLockGuard() with virNWFilterObj

Michal Privoznik posted 1 patch 2 years, 1 month ago

Download mbox

Test syntax-check failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/98a854ba418d941ef1f9ab84f7b6b813de1e27db.1647600214.git.mprivozn@redhat.com

src/conf/virnwfilterobj.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH] virnwfilterobj: Don't use virObjectLockGuard() with virNWFilterObj

Posted by Michal Privoznik 2 years, 1 month ago

While its name would suggest that virNWFilterObj is an actual
virObject it is not. It's a plain structure (with virMutex as its
first member). Therefore, when locking the struct
virObjectLockGuard() can' be used and virLockGuardLock() must be
used instead.

Spotted-by: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/conf/virnwfilterobj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c
index 309f8bddb4..e9bb2b1811 100644
--- a/src/conf/virnwfilterobj.c
+++ b/src/conf/virnwfilterobj.c
@@ -386,7 +386,7 @@ virNWFilterObjListCount(void *key G_GNUC_UNUSED,
 {
     virNWFilterObj *obj = payload;
     struct virNWFilterObjListData *data = opaque;
-    VIR_LOCK_GUARD lock = virObjectLockGuard(obj);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&obj->lock);
 
     if (data->filter(data->conn, obj->def))
         data->count++;
@@ -423,7 +423,7 @@ virNWFilterObjListCopyNames(void *key G_GNUC_UNUSED,
 {
     virNWFilterObj *obj = payload;
     struct virNWFilterNameData *data = opaque;
-    VIR_LOCK_GUARD lock = virObjectLockGuard(obj);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&obj->lock);
 
     if (data->filter &&
         !data->filter(data->conn, obj->def))
-- 
2.34.1