discover: Introduce a container type for boot options

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 7533cfa1d514b0b6f80048ad7362b5b932b3f94f..2b16b2ea2f7a9c937b864b66d28996cca9bae0cf 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -37,8 +37,8 @@ static void context_commit(struct device_handler *handler,
                struct discover_context *ctx)
 {
        struct discover_device *dev = ctx->device;
+       struct discover_boot_option *opt, *tmp;
        unsigned int i, existing_device;
-       struct boot_option *opt, *tmp;
 
        /* do we already have this device? */
        for (i = 0; i < handler->n_devices; i++) {
@@ -63,14 +63,15 @@ static void context_commit(struct device_handler *handler,
        /* move boot options from the context to the device */
        list_for_each_entry_safe(&ctx->boot_options, opt, tmp, list) {
                list_remove(&opt->list);
-               list_add(&dev->device->boot_options, &opt->list);
-               dev->device->n_options++;
-               discover_server_notify_boot_option_add(handler->server, opt);
+               list_add(&dev->boot_options, &opt->list);
+               talloc_steal(dev, opt);
+               discover_server_notify_boot_option_add(handler->server,
+                                                       opt->option);
        }
 }
 
 void discover_context_add_boot_option(struct discover_context *ctx,
-               struct boot_option *boot_option)
+               struct discover_boot_option *boot_option)
 {
        list_add(&ctx->boot_options, &boot_option->list);
        talloc_steal(ctx, boot_option);
@@ -118,7 +119,7 @@ int device_handler_get_device_count(const struct device_handler *handler)
  * device_handler_get_device - Get a handler device by index.
  */
 
-const struct device *device_handler_get_device(
+const struct discover_device *device_handler_get_device(
        const struct device_handler *handler, unsigned int index)
 {
        if (index >= handler->n_devices) {
@@ -126,7 +127,7 @@ const struct device *device_handler_get_device(
                return NULL;
        }
 
-       return handler->devices[index]->device;
+       return handler->devices[index];
 }
 
 static void setup_device_links(struct discover_device *dev)
@@ -303,7 +304,7 @@ static struct discover_device *discover_device_create(
 
        dev = talloc_zero(ctx, struct discover_device);
        dev->device = talloc_zero(dev, struct device);
-       list_init(&dev->device->boot_options);
+       list_init(&dev->boot_options);
 
        devname = event_get_param(ctx->event, "DEVNAME");
        if (devname)
@@ -316,6 +317,20 @@ static struct discover_device *discover_device_create(
        return dev;
 }
 
+struct discover_boot_option *discover_boot_option_create(
+               struct discover_context *ctx,
+               struct discover_device *device)
+{
+       struct discover_boot_option *opt;
+
+       opt = talloc_zero(ctx, struct discover_boot_option);
+       opt->option = talloc_zero(opt, struct boot_option);
+       opt->device = device;
+
+       return opt;
+}
+
+
 static int handle_add_udev_event(struct device_handler *handler,
                struct event *event)
 {
@@ -464,17 +479,104 @@ void device_handler_destroy(struct device_handler *handler)
        talloc_free(handler);
 }
 
-static struct boot_option *find_boot_option_by_id(
+static int device_match_path(struct discover_device *dev, const char *path)
+{
+       return !strcmp(dev->device_path, path);
+}
+
+static int device_match_uuid(struct discover_device *dev, const char *uuid)
+{
+       return dev->uuid && !strcmp(dev->uuid, uuid);
+}
+
+static int device_match_label(struct discover_device *dev, const char *label)
+{
+       return dev->label && !strcmp(dev->label, label);
+}
+
+static int device_match_id(struct discover_device *dev, const char *id)
+{
+       return !strcmp(dev->device->id, id);
+}
+
+static struct discover_device *device_lookup(
+               struct device_handler *device_handler,
+               int (match_fn)(struct discover_device *, const char *),
+               const char *str)
+{
+       struct discover_device *dev;
+       unsigned int i;
+
+       if (!str)
+               return NULL;
+
+       for (i = 0; i < device_handler->n_devices; i++) {
+               dev = device_handler->devices[i];
+
+               if (match_fn(dev, str))
+                       return dev;
+       }
+
+       return NULL;
+}
+
+struct discover_device *device_lookup_by_name(struct device_handler *handler,
+               const char *name)
+{
+       struct discover_device *dev;
+       char *path;
+
+       if (strncmp(name, "/dev/", strlen("/dev/")))
+               path = talloc_asprintf(NULL, "/dev/%s", name);
+       else
+               path = talloc_strdup(NULL, name);
+
+       dev = device_lookup_by_path(handler, path);
+
+       talloc_free(path);
+
+       return dev;
+}
+
+struct discover_device *device_lookup_by_path(
+               struct device_handler *device_handler,
+               const char *path)
+{
+       return device_lookup(device_handler, device_match_path, path);
+}
+
+struct discover_device *device_lookup_by_uuid(
+               struct device_handler *device_handler,
+               const char *uuid)
+{
+       return device_lookup(device_handler, device_match_uuid, uuid);
+}
+
+struct discover_device *device_lookup_by_label(
+               struct device_handler *device_handler,
+               const char *label)
+{
+       return device_lookup(device_handler, device_match_label, label);
+}
+
+struct discover_device *device_lookup_by_id(
+               struct device_handler *device_handler,
+               const char *id)
+{
+       return device_lookup(device_handler, device_match_id, id);
+}
+
+static struct discover_boot_option *find_boot_option_by_id(
                struct device_handler *handler, const char *id)
 {
        unsigned int i;
 
        for (i = 0; i < handler->n_devices; i++) {
                struct discover_device *dev = handler->devices[i];
-               struct boot_option *opt;
+               struct discover_boot_option *opt;
 
-               list_for_each_entry(&dev->device->boot_options, opt, list)
-                       if (!strcmp(opt->id, id))
+               list_for_each_entry(&dev->boot_options, opt, list)
+                       if (!strcmp(opt->option->id, id))
                                return opt;
        }
 
@@ -484,9 +586,9 @@ static struct boot_option *find_boot_option_by_id(
 void device_handler_boot(struct device_handler *handler,
                struct boot_command *cmd)
 {
-       struct boot_option *opt;
+       struct discover_boot_option *opt;
 
        opt = find_boot_option_by_id(handler, cmd->option_id);
 
-       boot(handler, opt, cmd, handler->dry_run);
+       boot(handler, opt->option, cmd, handler->dry_run);
 }