summaryrefslogtreecommitdiffstats
path: root/discover/device-handler.c
diff options
context:
space:
mode:
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>2016-06-09 11:47:20 +1000
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2016-06-28 16:17:21 +1000
commit1a72ffef7837cd2aa3e6be945ec03fb6b5caa51a (patch)
treee2680bc7dc7744f58ac7f2cc9f224f6a22928fa4 /discover/device-handler.c
parentdc96fc7df262a0b72ece710dcfc9ffab1c952dec (diff)
downloadtalos-petitboot-1a72ffef7837cd2aa3e6be945ec03fb6b5caa51a.zip
talos-petitboot-1a72ffef7837cd2aa3e6be945ec03fb6b5caa51a.tar.gz
discover/device-handler: Make boot_status() public
Rename boot_status() to device_handler_boot_status() and make it accessible by files that include device-handler.h. This enables the boot status to be updated from additional callers, in particular within parser functions. Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'discover/device-handler.c')
-rw-r--r--discover/device-handler.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c
index cc48747..1c69de0 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -396,7 +396,7 @@ void device_handler_remove(struct device_handler *handler,
talloc_free(device);
}
-static void boot_status(void *arg, struct boot_status *status)
+void device_handler_boot_status(void *arg, struct boot_status *status)
{
struct device_handler *handler = arg;
@@ -448,7 +448,8 @@ static int default_timeout(void *arg)
platform_pre_boot();
handler->pending_boot = boot(handler, handler->default_boot_option,
- NULL, handler->dry_run, boot_status, handler);
+ NULL, handler->dry_run, device_handler_boot_status,
+ handler);
handler->pending_boot_is_default = true;
return 0;
}
@@ -873,7 +874,7 @@ int device_handler_discover(struct device_handler *handler,
status->message = talloc_asprintf(status, _("Processing %s device %s"),
device_type_display_name(dev->device->type),
dev->device->id);
- boot_status(handler, status);
+ device_handler_boot_status(handler, status);
process_boot_option_queue(handler);
@@ -901,7 +902,7 @@ out:
*/
status->message = talloc_asprintf(status,_("Processing %s complete"),
dev->device->id);
- boot_status(handler, status);
+ device_handler_boot_status(handler, status);
talloc_free(status);
talloc_free(ctx);
@@ -924,7 +925,7 @@ int device_handler_dhcp(struct device_handler *handler,
*/
status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
dev->device->id);
- boot_status(handler, status);
+ device_handler_boot_status(handler, status);
/* create our context */
ctx = device_handler_discover_context_create(handler, dev);
@@ -940,7 +941,7 @@ int device_handler_dhcp(struct device_handler *handler,
*/
status->message = talloc_asprintf(status,_("Processing %s complete"),
dev->device->id);
- boot_status(handler, status);
+ device_handler_boot_status(handler, status);
talloc_free(status);
talloc_free(ctx);
@@ -958,7 +959,7 @@ int device_handler_conf(struct device_handler *handler,
status = talloc_zero(handler, struct boot_status);
status->type = BOOT_STATUS_INFO;
status->message = talloc_asprintf(status, _("Processing user config"));
- boot_status(handler, status);
+ device_handler_boot_status(handler, status);
/* create our context */
ctx = device_handler_discover_context_create(handler, dev);
@@ -970,7 +971,7 @@ int device_handler_conf(struct device_handler *handler,
status->message = talloc_asprintf(status,
_("Processing user config complete"));
- boot_status(handler, status);
+ device_handler_boot_status(handler, status);
talloc_free(status);
talloc_free(ctx);
@@ -1009,7 +1010,7 @@ void device_handler_boot(struct device_handler *handler,
platform_pre_boot();
handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
- boot_status, handler);
+ device_handler_boot_status, handler);
handler->pending_boot_is_default = false;
}
@@ -1211,7 +1212,7 @@ void device_handler_process_url(struct device_handler *handler,
status->message = talloc_asprintf(status, _("Config file %s parsed"),
pb_url->file);
msg:
- boot_status(handler, status);
+ device_handler_boot_status(handler, status);
talloc_free(status);
}
OpenPOWER on IntegriCloud