talloc_free(device);
}
+static void update_status(struct discover_client *client,
+ struct boot_status *status)
+{
+ if (client->ops.update_status)
+ client->ops.update_status(status, client->ops.cb_arg);
+ talloc_free(status);
+}
+
+static void update_sysinfo(struct discover_client *client,
+ struct system_info *sysinfo)
+{
+ if (client->ops.update_sysinfo)
+ client->ops.update_sysinfo(sysinfo, client->ops.cb_arg);
+ talloc_free(sysinfo);
+}
+
static int discover_client_process(void *arg)
{
struct discover_client *client = arg;
struct pb_protocol_message *message;
+ struct system_info *sysinfo;
+ struct boot_status *status;
struct boot_option *opt;
struct device *dev;
char *dev_id;
}
device_remove(client, dev_id);
break;
+ case PB_PROTOCOL_ACTION_STATUS:
+ status = talloc_zero(client, struct boot_status);
+
+ rc = pb_protocol_deserialise_boot_status(status, message);
+ if (rc) {
+ pb_log("%s: invalid status message?\n", __func__);
+ return 0;
+ }
+ update_status(client, status);
+ break;
+ case PB_PROTOCOL_ACTION_SYSTEM_INFO:
+ sysinfo = talloc_zero(client, struct system_info);
+
+ rc = pb_protocol_deserialise_system_info(sysinfo, message);
+ if (rc) {
+ pb_log("%s: invalid sysinfo message?\n", __func__);
+ return 0;
+ }
+ update_sysinfo(client, sysinfo);
+ break;
default:
pb_log("%s: unknown action %d\n", __func__, message->action);
}
goto out_err;
}
- waiter_register(waitset, client->fd, WAIT_IN, discover_client_process,
- client);
+ waiter_register_io(waitset, client->fd, WAIT_IN,
+ discover_client_process, client);
return client;
const struct boot_option *boot_option,
const struct pb_boot_data *data)
{
-
- command->option_id = boot_option->id;
+ command->option_id = boot_option ? boot_option->id : NULL;
command->boot_image_file = data->image;
command->initrd_file = data->initrd;
+ command->dtb_file = data->dtb;
command->boot_args = data->args;
}
return rc;
}
+
+int discover_client_cancel_default(struct discover_client *client)
+{
+ struct pb_protocol_message *message;
+
+ message = pb_protocol_create_message(client,
+ PB_PROTOCOL_ACTION_CANCEL_DEFAULT, 0);
+
+ if (!message)
+ return -1;
+
+ return pb_protocol_write_message(client->fd, message);
+}