External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

node_device_udev: Move responsibility to release (init|udev)Thread to udevEventDataDispose

Browse Source 
Everything is released in `udevEventDataDispose` except for the threads, change
this as this makes the code easier to read as it can be simplified a little.

Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
This commit is contained in:
Marc Hartmayer 2024-04-23 20:08:57 +02:00 committed by Jonathon Jongsma
parent d7c8908be8
commit 4daa362706
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/node_device/node_device_udev.c
View File

@ -86,12 +86,16 @@ udevEventDataDispose(void *obj)
struct udev *udev = NULL;
udevEventData *priv = obj;
g_clear_pointer(&priv->initThread, g_free);
if (priv->watch != -1)
virEventRemoveHandle(priv->watch);
if (priv->mdevctlTimeout != -1)
virEventRemoveTimeout(priv->mdevctlTimeout);
g_clear_pointer(&priv->udevThread, g_free);
if (!priv->udev_monitor)
return;
@ -1730,14 +1734,10 @@ nodeStateCleanup(void)
priv->udevThreadQuit = true;
virCondSignal(&priv->udevThreadCond);
}
if (priv->initThread) {
if (priv->initThread)
virThreadJoin(priv->initThread);
g_clear_pointer(&priv->initThread, g_free);
}
if (priv->udevThread) {
if (priv->udevThread)
virThreadJoin(priv->udevThread);
g_clear_pointer(&priv->udevThread, g_free);
}
}
virObjectUnref(priv);
@ -2328,7 +2328,6 @@ nodeStateInitialize(bool privileged,
"udev-event", false, NULL) < 0) {
virReportSystemError(errno, "%s",
_("failed to create udev handler thread"));
g_clear_pointer(&priv->udevThread, g_free);
goto unlock;
}
@ -2360,7 +2359,6 @@ nodeStateInitialize(bool privileged,
"nodedev-init", false, udev) < 0) {
virReportSystemError(errno, "%s",
_("failed to create udev enumerate thread"));
g_clear_pointer(&priv->initThread, g_free);
goto cleanup;
}