virnwfilterobj: Don't use virObjectLockGuard() with virNWFilterObj

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>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c
index 309f8bddb466ee707d9cab62b34fcb26f9568828..e9bb2b181153fe0ca7c5e6f0e1857fd224de4278 100644 (file)
--- 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))