Now what we have protocol support, send status updates during the boot
process.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
+static void update_status(boot_status_fn fn, void *arg, int type,
+ char *message)
+{
+ struct boot_status status;
+
+ status.type = type;
+ status.message = message;
+ status.progress = -1;
+ status.detail = NULL;
+
+ fn(arg, &status);
+}
+
int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
+ int dry_run, boot_status_fn status_fn, void *status_arg)
{
char *local_image, *local_initrd;
unsigned int clean_image = 0;
{
char *local_image, *local_initrd;
unsigned int clean_image = 0;
+ update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+ "loading kernel");
local_image = load_url(NULL, image, &clean_image);
local_image = load_url(NULL, image, &clean_image);
+ if (!local_image) {
+ update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+ "Couldn't load kernel image");
+ update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+ "loading initrd");
local_initrd = load_url(NULL, initrd, &clean_initrd);
local_initrd = load_url(NULL, initrd, &clean_initrd);
+ if (!local_initrd) {
+ update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+ "Couldn't load initrd image");
+ update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+ "performing kexec_load");
+
result = kexec_load(local_image, local_initrd, args, dry_run);
result = kexec_load(local_image, local_initrd, args, dry_run);
+ if (result) {
+ update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+ "kexec load failed");
+ }
+
no_load:
if (clean_image)
unlink(local_image);
no_load:
if (clean_image)
unlink(local_image);
talloc_free(local_image);
talloc_free(local_initrd);
talloc_free(local_image);
talloc_free(local_initrd);
+ if (!result) {
+ update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+ "performing kexec reboot");
+
result = kexec_reboot(dry_run);
result = kexec_reboot(dry_run);
+ if (result) {
+ update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+ "kexec reboot failed");
+ }
+ }
+
struct boot_option;
struct boot_command;
struct boot_option;
struct boot_command;
+typedef void (*boot_status_fn)(void *arg, struct boot_status *);
+
int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
+ int dry_run, boot_status_fn status_fn, void *status_arg);
+static void boot_status(void *arg, struct boot_status *status)
+{
+ struct device_handler *handler = arg;
+
+ discover_server_notify_boot_status(handler->server, status);
+}
+
void device_handler_boot(struct device_handler *handler,
struct boot_command *cmd)
{
void device_handler_boot(struct device_handler *handler,
struct boot_command *cmd)
{
opt = find_boot_option_by_id(handler, cmd->option_id);
opt = find_boot_option_by_id(handler, cmd->option_id);
- boot(handler, opt, cmd, handler->dry_run);
+ boot(handler, opt, cmd, handler->dry_run, boot_status, handler);