va_end(ap);
}
-static int pbt_client_run_kexec(struct pbt_item *item)
+static int pbt_client_boot(struct pbt_item *item)
{
int result;
struct pb_opt_data *opt_data = pbt_opt_data_from_item(item);
pbt_frame_status_printf(&item->pbt_client->frame, "Booting %s...",
pbt_item_name(item));
- assert(item->pbt_client->kexec_cb);
- result = item->pbt_client->kexec_cb(item->pbt_client, opt_data);
+ result = discover_client_boot(item->pbt_client->discover_client,
+ opt_data->dev, opt_data->opt, opt_data->bd);
- if (!result) {
- sleep(item->pbt_client->dry_run ? 1 : 60);
+ if (result) {
+ pb_log("%s: failed: %s\n", __func__, opt_data->bd->image);
+ pbt_frame_status_printf(&item->pbt_client->frame,
+ "Failed: kexec %s", opt_data->bd->image);
}
- pb_log("%s: failed: %s\n", __func__, opt_data->kd->image);
-
- pbt_frame_status_printf(&item->pbt_client->frame, "Failed: kexec %s",
- opt_data->kd->image);
-
return 0;
}
i->pb_opt = opt;
i->pbt_client = client;
- i->on_execute = pbt_client_run_kexec;
+ i->on_execute = pbt_client_boot;
i->on_edit = pbt_client_on_edit;
i->data = opt_data = talloc(i, struct pb_opt_data);
opt_data->name = opt->name;
- opt_data->kd = talloc(i, struct pb_kexec_data);
- opt_data->kd->image = talloc_strdup(opt_data->kd,
+ opt_data->bd = talloc(i, struct pb_boot_data);
+ opt_data->bd->image = talloc_strdup(opt_data->bd,
opt->boot_image_file);
- opt_data->kd->initrd = talloc_strdup(opt_data->kd,
+ opt_data->bd->initrd = talloc_strdup(opt_data->bd,
opt->initrd_file);
- opt_data->kd->args = talloc_strdup(opt_data->kd,
+ opt_data->bd->args = talloc_strdup(opt_data->bd,
opt->boot_args);
opt_data->dev = dev;
opt_data->opt = opt;
struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
unsigned int width, unsigned int height,
- int (*kexec_cb)(struct pbt_client *, struct pb_opt_data *),
int start_deamon, int dry_run)
{
struct pbt_client *pbt_client;
talloc_set_destructor(pbt_client, (void *)pbt_client_destructor);
+ pbt_client->waitset = waitset_create(pbt_client);
+
pbt_client->sig = "pbt_client";
- pbt_client->kexec_cb = kexec_cb;
pbt_client->dry_run = dry_run;
- pbt_client->frame.scr = pbt_scr_init(pbt_client, backend, width, height,
- NULL, NULL);
+ pbt_client->frame.scr = pbt_scr_init(pbt_client, pbt_client->waitset,
+ backend, width, height, NULL, NULL);
+
if (!pbt_client->frame.scr)
goto fail_scr_init;
retry_start:
for (i = start_deamon ? 2 : 10; i; i--) {
pbt_client->discover_client
- = discover_client_init(&pbt_client_ops, pbt_client);
+ = discover_client_init(pbt_client->waitset,
+ &pbt_client_ops, pbt_client);
if (pbt_client->discover_client || !i)
break;
pb_log("%s: waiting for server %d\n", __func__, i);
goto fail_client_init;
}
- waiter_register(discover_client_get_fd(pbt_client->discover_client),
- WAIT_IN, (waiter_cb)discover_client_process,
- pbt_client->discover_client);
-
return pbt_client;
fail_client_init: