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->bd->image);
-
- pbt_frame_status_printf(&item->pbt_client->frame, "Failed: kexec %s",
- opt_data->bd->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);
}
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)
+ unsigned int width, unsigned int height, int start_deamon)
{
struct pbt_client *pbt_client;
unsigned int i;
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, pbt_client->waitset,
backend, width, height, NULL, NULL);
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(pbt_client->waitset,
- 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: