plat/xen: Adapt Xen to the new uk_intctlr API

Notice: Picking individual commits in this PR will break the build.

Signed-off-by: Michalis Pappas <michalis@unikraft.io>
Reviewed-by: Marco Schlumpp <marco@unikraft.io>
Reviewed-by: Sergiu Moga <sergiu@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #1103

diff --git a/plat/xen/events.c b/plat/xen/events.c
index e32e8e9e54b4ab888ef6aa25e8be4d3ab6e8bab7..79de96fe324fe911a7f60171daf7ebfa5bd24e36 100644 (file)
--- a/plat/xen/events.c
+++ b/plat/xen/events.c
@@ -38,7 +38,6 @@
 #include <common/events.h>
 #include <xen/xen.h>
 #include <uk/print.h>
-#include <uk/plat/irq.h>
 #include <uk/event.h>
 #include <uk/assert.h>
 #include <uk/bitops.h>
@@ -54,6 +53,11 @@ typedef struct _ev_action_t {
        uint32_t count;
 } ev_action_t;
 
+struct uk_event_irq_data {
+       struct __regs *regs;
+       unsigned long irq;
+};
+
 static ev_action_t ev_actions[NR_EVS];
 static void default_handler(evtchn_port_t port, struct __regs *regs,
                            void *data);
@@ -90,7 +94,7 @@ int do_event(evtchn_port_t port, struct __regs *regs)
 {
        ev_action_t *action;
        int rc;
-       struct ukplat_event_irq_data ctx;
+       struct uk_event_irq_data ctx;
 
        clear_evtchn(port);