discover: Send boot status messages during boot()
authorJeremy Kerr <jk@ozlabs.org>
Wed, 1 May 2013 01:56:54 +0000 (09:56 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Mon, 6 May 2013 01:02:12 +0000 (09:02 +0800)
Now what we have protocol support, send status updates during the boot
process.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
discover/boot.c
discover/boot.h
discover/device-handler.c

index 804425c65878a832ee320cf6e8b39635b4986c1b..d054d5d51c24733203fbc0706e0b06c527c8a06a 100644 (file)
@@ -97,8 +97,21 @@ static int kexec_reboot(int dry_run)
        return result;
 }
 
        return result;
 }
 
+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)
+               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;
@@ -135,18 +148,36 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 
        result = -1;
 
 
        result = -1;
 
+       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)
+       if (!local_image) {
+               update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+                               "Couldn't load kernel image");
                goto no_load;
                goto no_load;
+       }
 
        if (initrd) {
 
        if (initrd) {
+               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)
+               if (!local_initrd) {
+                       update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+                                       "Couldn't load initrd image");
                        goto no_load;
                        goto no_load;
+               }
        }
 
        }
 
+       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);
@@ -156,8 +187,17 @@ no_load:
        talloc_free(local_image);
        talloc_free(local_initrd);
 
        talloc_free(local_image);
        talloc_free(local_initrd);
 
-       if (!result)
+       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");
+               }
+       }
+
        return result;
 }
        return result;
 }
index 1dc5767b083d50a03fa899fe1a8cf56ddb24e473..bbb02cf7858e39e0f077fc42e56538c2b9a1f65b 100644 (file)
@@ -4,7 +4,9 @@
 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);
+               int dry_run, boot_status_fn status_fn, void *status_arg);
 
 #endif /* _BOOT_H */
 
 #endif /* _BOOT_H */
index 594a7c3c80a87b2c142cd17730cf09f46b50b149..d3274bce28cff54f895b7510c0f5092aea19fe59 100644 (file)
@@ -663,6 +663,13 @@ static struct discover_boot_option *find_boot_option_by_id(
        return NULL;
 }
 
        return NULL;
 }
 
+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)
 {
@@ -670,5 +677,5 @@ void device_handler_boot(struct device_handler *handler,
 
        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);
 }
 }