From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 22 Mar 2022 16:47:44 +0000 (+0100)
Subject: node_device_driver: Use automatic mutex management
X-Git-Tag: v8.3.0-rc1~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29bb566a22ae96b30e7f3b066bc2af025fc3cdf2;p=thirdparty%2Flibvirt.git

node_device_driver: Use automatic mutex management

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 130c1d4023..1eb452b989 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -1072,14 +1072,10 @@ static bool
 matchDeviceAddress(virNodeDeviceObj *obj,
                    const void *opaque)
 {
-    g_autofree char *addr = NULL;
-    bool want = false;
-
-    virObjectLock(obj);
-    addr = nodeDeviceObjFormatAddress(obj);
-    want = STREQ_NULLABLE(addr, opaque);
-    virObjectUnlock(obj);
-    return want;
+    VIR_LOCK_GUARD lock = virObjectLockGuard(obj);
+    g_autofree char *addr = nodeDeviceObjFormatAddress(obj);
+
+    return STREQ_NULLABLE(addr, opaque);
 }