From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 31 Aug 2021 13:09:51 +0000 (+0200)
Subject: lxcDomainDetachDeviceHostdevUSBLive: Use VIR_WITH_OBJECT_LOCK_GUARD
X-Git-Tag: v8.1.0-rc1~227
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28e9877e865950ea656e9884f9dcd4a3119e354e;p=thirdparty%2Flibvirt.git

lxcDomainDetachDeviceHostdevUSBLive: Use VIR_WITH_OBJECT_LOCK_GUARD

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 7bc39120ee..42053de9c3 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -4045,9 +4045,9 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriver *driver,
         VIR_WARN("cannot deny device %s for domain %s: %s",
                  dst, vm->def->name, virGetLastErrorMessage());
 
-    virObjectLock(hostdev_mgr->activeUSBHostdevs);
-    virUSBDeviceListDel(hostdev_mgr->activeUSBHostdevs, usb);
-    virObjectUnlock(hostdev_mgr->activeUSBHostdevs);
+    VIR_WITH_OBJECT_LOCK_GUARD(hostdev_mgr->activeUSBHostdevs) {
+        virUSBDeviceListDel(hostdev_mgr->activeUSBHostdevs, usb);
+    }
 
     virDomainHostdevRemove(vm->def, idx);
     virDomainHostdevDefFree(def);