From: Michalis Pappas <michalis@unikraft.io>
Date: Thu, 14 Sep 2023 12:03:14 +0000 (+0200)
Subject: lib/ukboot: Update ukboot to use the new uk_intctlr API
X-Git-Tag: RELEASE-0.15.0~46
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=be2248c6c87a87568176859154465ffb4b164f46;p=unikraft%2Funikraft.git

lib/ukboot: Update ukboot to use 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/lib/ukboot/boot.c b/lib/ukboot/boot.c
index c53504d2a..c37508b89 100644
--- a/lib/ukboot/boot.c
+++ b/lib/ukboot/boot.c
@@ -73,7 +73,6 @@
 #include <uk/plat/bootstrap.h>
 #include <uk/plat/memory.h>
 #include <uk/plat/lcpu.h>
-#include <uk/plat/irq.h>
 #include <uk/plat/time.h>
 #include <uk/essentials.h>
 #include <uk/print.h>
@@ -91,6 +90,10 @@
 #include <uk/plat/tls.h>
 #include "banner.h"
 
+#if CONFIG_LIBUKINTCTLR
+#include <uk/intctlr.h>
+#endif /* CONFIG_LIBUKINTCTLR */
+
 int main(int argc, char *argv[]) __weak;
 
 #if defined(CONFIG_LIBUKBOOT_HEAP_BASE) && defined(CONFIG_LIBUKVMEM)
@@ -315,12 +318,12 @@ void ukplat_entry(int argc, char *argv[])
 	ukplat_tlsp_set(ukarch_tls_tlsp(tls));
 #endif /* !CONFIG_LIBUKBOOT_NOALLOC */
 
-#if CONFIG_LIBUKALLOC
-	uk_pr_info("Initialize IRQ subsystem...\n");
-	rc = ukplat_irq_init(a);
-	if (unlikely(rc != 0))
-		UK_CRASH("Could not initialize the platform IRQ subsystem\n");
-#endif
+#if CONFIG_LIBUKINTCTLR
+	uk_pr_info("Initialize the IRQ subsystem...\n");
+	rc = uk_intctlr_init(a);
+	if (unlikely(rc))
+		UK_CRASH("Could not initialize the IRQ subsystem\n");
+#endif /* CONFIG_LIBUKINTCTLR */
 
 	/* On most platforms the timer depend on an initialized IRQ subsystem */
 	uk_pr_info("Initialize platform time...\n");