ui: pb_kexec_data -> pb_boot_data

[petitboot] / ui / twin / pbt-client.c

diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c
index ed12e5a993a7d381550d4eac54e70f13d3f8263b..39facf5fe73094b16dc8759086c43708daa2b6f3 100644 (file)
--- a/ui/twin/pbt-client.c
+++ b/ui/twin/pbt-client.c
@@ -23,6 +23,8 @@
 #include <assert.h>
 #include <string.h>
 
+#include <pb-protocol/pb-protocol.h>
+
 #include "pbt-client.h"
 
 #include "log/log.h"
@@ -67,10 +69,10 @@ static int pbt_client_run_kexec(struct pbt_item *item)
                sleep(item->pbt_client->dry_run ? 1 : 60);
        }
 
-       pb_log("%s: failed: %s\n", __func__, opt_data->kd->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->kd->image);
+               opt_data->bd->image);
 
        return 0;
 }
@@ -143,12 +145,12 @@ static int pbt_device_add(struct device *dev, struct pbt_client *client)
 
                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;
@@ -279,11 +281,14 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
 
        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;
@@ -327,9 +332,10 @@ retry_start:
                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);
+       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;