X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=9e1a5ce8a5155294efe33b5ee817853c3c57fc43;hp=656c5ab7faa3cacb294f329bdea474f50e526c07;hb=37bff93c8b0a71432613f41f2319dc073ca64619;hpb=0752a75d2e37243245dbd6dfd3e512c6f25eca8c

diff --git a/discover/udev.c b/discover/udev.c
index 656c5ab..9e1a5ce 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -121,7 +121,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 		if (ddev) {
 			pb_log("SKIP: %s UUID [%s] already present (as %s)\n",
 					name, uuid, ddev->device->id);
-			return -1;
+			return 0;
 		}
 	}
 
@@ -263,23 +263,18 @@ static int udev_handle_dev_change(struct pb_udev *udev, struct udev_device *dev)
 static int udev_handle_dev_action(struct udev_device *dev, const char *action)
 {
 	struct pb_udev *udev = udev_get_userdata(udev_device_get_udev(dev));
+	struct udev_list_entry *list;
+	const char *name;
 
-#ifdef DEBUG
-	{
-		struct udev_list_entry *list;
-		const char *name;
-
-		list = udev_device_get_properties_list_entry(dev);
-		name = udev_device_get_sysname(dev);
+	list = udev_device_get_properties_list_entry(dev);
+	name = udev_device_get_sysname(dev);
 
-		pb_debug("%s: action %s, device %s\n", __func__, action, name);
-		pb_debug("%s properties:\n", __func__);
+	pb_debug("udev: action %s, device %s\n", action, name);
+	pb_debug("udev: properties:\n");
 
-		for (; list; list = udev_list_entry_get_next(list))
-			pb_log("\t%-20s: %s\n", udev_list_entry_get_name(list),
-					udev_list_entry_get_value(list));
-	} while (0);
-#endif
+	for (; list; list = udev_list_entry_get_next(list))
+		pb_debug("\t%-20s: %s\n", udev_list_entry_get_name(list),
+				udev_list_entry_get_value(list));
 
 	if (!strcmp(action, "add"))
 		return udev_handle_dev_add(udev, dev);
@@ -398,10 +393,8 @@ static int udev_process(void *arg)
 	struct udev_monitor *monitor = arg;
 	struct udev_device *dev;
 	const char *action;
-	int result;
 
 	dev = udev_monitor_receive_device(monitor);
-
 	if (!dev) {
 		pb_log("udev_monitor_receive_device failed\n");
 		return -1;
@@ -411,17 +404,12 @@ static int udev_process(void *arg)
 
 	if (!action) {
 		pb_log("udev_device_get_action failed\n");
-		goto fail;
+	} else {
+		udev_handle_dev_action(dev, action);
 	}
 
-	result = udev_handle_dev_action(dev, action);
-
-	udev_device_unref(dev);
-	return result;
-
-fail:
 	udev_device_unref(dev);
-	return -1;
+	return 0;
 }
 
 static void udev_log_fn(struct udev __attribute__((unused)) *udev,
@@ -432,12 +420,13 @@ static void udev_log_fn(struct udev __attribute__((unused)) *udev,
       vfprintf(pb_log_get_stream(), format, args);
 }
 
-struct pb_udev *udev_init(struct waitset *waitset,
-	struct device_handler *handler)
+struct pb_udev *udev_init(struct device_handler *handler,
+		struct waitset *waitset)
 {
+	struct pb_udev *udev;
 	int result;
-	struct pb_udev *udev = talloc(NULL, struct pb_udev);
 
+	udev = talloc(handler, struct pb_udev);
 	talloc_set_destructor(udev, udev_destructor);
 	udev->handler = handler;
 
@@ -476,7 +465,8 @@ fail_new:
 	return NULL;
 }
 
-void udev_destroy(struct pb_udev *udev)
+void udev_reinit(struct pb_udev *udev)
 {
-	talloc_free(udev);
+	pb_log("udev: reinit requested, starting enumeration\n");
+	udev_enumerate(udev->udev);
 }