提交 ad97fece 编写于 作者: E Erik Skultety

nodedev: Introduce udevHandleOneDevice

Let this new method handle the device object we obtained from the
monitor in order to enhance readability.
Signed-off-by: NErik Skultety <eskultet@redhat.com>
上级 d3f2820f
...@@ -1598,6 +1598,23 @@ nodeStateCleanup(void) ...@@ -1598,6 +1598,23 @@ nodeStateCleanup(void)
} }
static int
udevHandleOneDevice(struct udev_device *device)
{
const char *action = udev_device_get_action(device);
VIR_DEBUG("udev action: '%s'", action);
if (STREQ(action, "add") || STREQ(action, "change"))
return udevAddOneDevice(device);
if (STREQ(action, "remove"))
return udevRemoveOneDevice(device);
return 0;
}
static void static void
udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, udevEventHandleCallback(int watch ATTRIBUTE_UNUSED,
int fd, int fd,
...@@ -1606,7 +1623,6 @@ udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, ...@@ -1606,7 +1623,6 @@ udevEventHandleCallback(int watch ATTRIBUTE_UNUSED,
{ {
struct udev_device *device = NULL; struct udev_device *device = NULL;
struct udev_monitor *udev_monitor = DRV_STATE_UDEV_MONITOR(driver); struct udev_monitor *udev_monitor = DRV_STATE_UDEV_MONITOR(driver);
const char *action = NULL;
int udev_fd = -1; int udev_fd = -1;
udev_fd = udev_monitor_get_fd(udev_monitor); udev_fd = udev_monitor_get_fd(udev_monitor);
...@@ -1635,18 +1651,7 @@ udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, ...@@ -1635,18 +1651,7 @@ udevEventHandleCallback(int watch ATTRIBUTE_UNUSED,
goto cleanup; goto cleanup;
} }
action = udev_device_get_action(device); udevHandleOneDevice(device);
VIR_DEBUG("udev action: '%s'", action);
if (STREQ(action, "add") || STREQ(action, "change")) {
udevAddOneDevice(device);
goto cleanup;
}
if (STREQ(action, "remove")) {
udevRemoveOneDevice(device);
goto cleanup;
}
cleanup: cleanup:
udev_device_unref(device); udev_device_unref(device);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册