External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodedev: Separate mdevctl monitor setup into a function

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2021-04-12 17:15:25 +02:00
parent e65d4917a4
commit 246af1278a
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/node_device/node_device_udev.c
View File

@ -2119,6 +2119,29 @@ monitorFileRecursively(udevEventData *udev,
} }
static int
mdevctlEnableMonitor(udevEventData *priv)
{
g_autoptr(GFile) mdevctlConfigDir = g_file_new_for_path("/etc/mdevctl.d");
/* mdevctl may add notification events in the future:
* https://github.com/mdevctl/mdevctl/issues/27. For now, fall back to
* monitoring the mdevctl configuration directory for changes.
* mdevctl configuration is stored in a directory tree within
* /etc/mdevctl.d/. There is a directory for each parent device, which
* contains a file defining each mediated device */
virMutexLock(&priv->mdevctlLock);
if (!(priv->mdevctlMonitors = monitorFileRecursively(priv,
mdevctlConfigDir))) {
virMutexUnlock(&priv->mdevctlLock);
return -1;
}
virMutexUnlock(&priv->mdevctlLock);
return 0;
}
static void static void
mdevctlEventHandleCallback(GFileMonitor *monitor G_GNUC_UNUSED, mdevctlEventHandleCallback(GFileMonitor *monitor G_GNUC_UNUSED,
GFile *file, GFile *file,
@ -2168,7 +2191,6 @@ nodeStateInitialize(bool privileged,
{ {
udevEventDataPtr priv = NULL; udevEventDataPtr priv = NULL;
struct udev *udev = NULL; struct udev *udev = NULL;
g_autoptr(GFile) mdevctlConfigDir = g_file_new_for_path("/etc/mdevctl.d");
if (root != NULL) { if (root != NULL) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
@ -2272,19 +2294,8 @@ nodeStateInitialize(bool privileged,
if (priv->watch == -1) if (priv->watch == -1)
goto unlock; goto unlock;
/* mdevctl may add notification events in the future: if (mdevctlEnableMonitor(priv) < 0)
* https://github.com/mdevctl/mdevctl/issues/27. For now, fall back to
* monitoring the mdevctl configuration directory for changes.
* mdevctl configuration is stored in a directory tree within
* /etc/mdevctl.d/. There is a directory for each parent device, which
* contains a file defining each mediated device */
virMutexLock(&priv->mdevctlLock);
if (!(priv->mdevctlMonitors = monitorFileRecursively(priv,
mdevctlConfigDir))) {
virMutexUnlock(&priv->mdevctlLock);
goto unlock; goto unlock;
}
virMutexUnlock(&priv->mdevctlLock);
virObjectUnlock(priv); virObjectUnlock(priv);