X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=13dfe0c9781fc5be889e48e34340cbb4e952aecd;hp=ca088dc7673cc58293b0d93062153bd684031e1e;hb=dd8fe077022138d1f6aca7e6d6cceec61f56ce95;hpb=a7c41a2339e0ed4bfd0954c2238eca8bc866a66c

diff --git a/discover/boot.c b/discover/boot.c
index ca088dc..13dfe0c 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -15,6 +15,7 @@
 #include <system/system.h>
 #include <talloc/talloc.h>
 #include <url/url.h>
+#include <util/util.h>
 
 #include "device-handler.h"
 #include "boot.h"
@@ -35,6 +36,7 @@ struct boot_task {
 	boot_status_fn status_fn;
 	void *status_arg;
 	bool dry_run;
+	bool cancelled;
 };
 
 /**
@@ -135,6 +137,8 @@ static void __attribute__((format(__printf__, 4, 5))) update_status(
 	status.progress = -1;
 	status.detail = NULL;
 
+	pb_debug("boot status: [%d] %s\n", type, status.message);
+
 	fn(arg, &status);
 
 	talloc_free(status.message);
@@ -306,12 +310,50 @@ static void cleanup_load(struct load_url_result *result)
 	unlink(result->local);
 }
 
-static void boot_process(struct load_url_result *result __attribute__((unused)),
-		void *data)
+static void cleanup_cancellations(struct boot_task *task,
+		struct load_url_result *cur_result)
+{
+	struct load_url_result *result, **results[] = {
+		&task->image, &task->initrd, &task->dtb,
+	};
+	bool pending = false;
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(results); i++) {
+		result = *results[i];
+
+		if (!result)
+			continue;
+
+		/* We need to cleanup and free any completed loads */
+		if (result == cur_result || result->status == LOAD_OK
+				|| result->status == LOAD_ERROR) {
+			cleanup_load(result);
+			talloc_free(result);
+			*results[i] = NULL;
+
+		/* ... and cancel any pending loads, which we'll free in
+		 * the completion callback */
+		} else if (result->status == LOAD_ASYNC) {
+			load_url_async_cancel(result);
+			pending = true;
+		}
+	}
+
+	if (!pending)
+		talloc_free(task);
+}
+
+static void boot_process(struct load_url_result *result, void *data)
 {
 	struct boot_task *task = data;
 	int rc = -1;
 
+	if (task->cancelled) {
+		cleanup_cancellations(task, result);
+		return;
+	}
+
 	if (load_pending(task->image) ||
 			load_pending(task->initrd) ||
 			load_pending(task->dtb))
@@ -350,8 +392,6 @@ no_load:
 					"kexec reboot failed");
 		}
 	}
-
-	talloc_free(task);
 }
 
 static int start_url_load(struct boot_task *task, const char *name,
@@ -370,8 +410,9 @@ static int start_url_load(struct boot_task *task, const char *name,
 	return 0;
 }
 
-int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
-		int dry_run, boot_status_fn status_fn, void *status_arg)
+struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
+		struct boot_command *cmd, int dry_run,
+		boot_status_fn status_fn, void *status_arg)
 {
 	struct pb_url *image = NULL, *initrd = NULL, *dtb = NULL;
 	struct boot_task *boot_task;
@@ -396,7 +437,7 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 		pb_log("%s: no image specified\n", __func__);
 		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
 				"Boot failed: no image specified");
-		return -1;
+		return NULL;
 	}
 
 	if (cmd && cmd->initrd_file) {
@@ -431,8 +472,22 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 	  || start_url_load(boot_task, "dtb", dtb, &boot_task->dtb);
 
 	/* If all URLs are local, we may be done. */
-	if (!rc)
-		boot_process(NULL, boot_task);
+	if (rc) {
+		talloc_free(boot_task);
+		return NULL;
+	}
+
+	boot_process(NULL, boot_task);
+
+	return boot_task;
+}
+
+void boot_cancel(struct boot_task *task)
+{
+	task->cancelled = true;
+
+	update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
+			"Boot cancelled");
 
-	return rc;
+	cleanup_cancellations(task, NULL);
 }