void device_handler_remove(struct device_handler *handler,
struct discover_device *device)
{
+ struct discover_boot_option *opt, *tmp;
unsigned int i;
for (i = 0; i < handler->n_devices; i++)
return;
}
+ /* Free any unresolved options, as they're currently allocated
+ * against the handler */
+ list_for_each_entry_safe(&handler->unresolved_boot_options,
+ opt, tmp, list) {
+ if (opt->device != device)
+ continue;
+ list_remove(&opt->list);
+ talloc_free(opt);
+ }
+
handler->n_devices--;
memmove(&handler->devices[i], &handler->devices[i + 1],
(handler->n_devices - i) * sizeof(handler->devices[0]));
test-pxe-mac-without-conf \
test-pxe-ip-without-conf \
test-pxe-non-url-conf \
- test-pxe-local
+ test-pxe-local \
+ test-unresolved-remove
$(TESTS): %: %.embedded-config.o
$(TESTS): LDADD += $@.embedded-config.o
int test_run_parser(struct parser_test *test, const char *parser_name);
void test_hotplug_device(struct parser_test *test, struct discover_device *dev);
+void test_remove_device(struct parser_test *test, struct discover_device *dev);
void test_add_file_data(struct parser_test *test, struct discover_device *dev,
const char *filename, const void *data, int size);
--- /dev/null
+
+#include "parser-test.h"
+
+#if 0 /* PARSER_EMBEDDED_CONFIG */
+menuentry 'Linux' {
+ search --set=root ec50d321-aab1-4335-8a87-aa8fadd80a09
+ linux /vmlinux
+}
+#endif
+
+void run_test(struct parser_test *test)
+{
+ struct discover_boot_option *opt;
+ struct discover_context *ctx;
+ struct discover_device *dev;
+
+ test_read_conf_embedded(test, "/grub.cfg");
+
+ test_run_parser(test, "grub2");
+
+ ctx = test->ctx;
+
+ check_boot_option_count(ctx, 1);
+ opt = get_boot_option(ctx, 0);
+ check_name(opt, "Linux");
+ check_unresolved_resource(opt->boot_image);
+
+ test_remove_device(test, test->ctx->device);
+
+ dev = test_create_device(test, "external");
+ dev->uuid = "ec50d321-aab1-4335-8a87-aa8fadd80a09";
+ test_hotplug_device(test, dev);
+
+ check_boot_option_count(ctx, 0);
+}
boot_option_resolve(test->handler, opt);
}
+void test_remove_device(struct parser_test *test, struct discover_device *dev)
+{
+ struct discover_boot_option *opt, *tmp;
+
+ if (dev == test->ctx->device) {
+ list_for_each_entry_safe(&test->ctx->boot_options,
+ opt, tmp, list) {
+ list_remove(&opt->list);
+ talloc_free(opt);
+ }
+ }
+
+ device_handler_remove(test->handler, dev);
+}
+
struct discover_boot_option *get_boot_option(struct discover_context *ctx,
int idx)
{