[init] Show initialisation function names in debug messages

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/x86/core/cpuid_settings.c b/src/arch/x86/core/cpuid_settings.c
index 9bc69f47771e400710649da73e507dd680a8f543..44d38debc05900cba8d70f8df140806917a1accb 100644 (file)
--- a/src/arch/x86/core/cpuid_settings.c
+++ b/src/arch/x86/core/cpuid_settings.c
@@ -250,6 +250,7 @@ static void cpuid_settings_init ( void ) {
 
 /** CPUID settings initialiser */
 struct init_fn cpuid_settings_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "cpuid",
        .initialise = cpuid_settings_init,
 };
 

diff --git a/src/arch/x86/core/debugcon.c b/src/arch/x86/core/debugcon.c
index 60de61f55da512e3728ce630e6f567e6c124d9fb..0e3a5dfc7c7924c11326c20c01be46e673013bbb 100644 (file)
--- a/src/arch/x86/core/debugcon.c
+++ b/src/arch/x86/core/debugcon.c
@@ -86,5 +86,6 @@ static void debugcon_init ( void ) {
  * Debug port console initialisation function
  */
 struct init_fn debugcon_init_fn __init_fn ( INIT_EARLY ) = {
+       .name = "debugcon",
        .initialise = debugcon_init,
 };

diff --git a/src/arch/x86/core/pci_autoboot.c b/src/arch/x86/core/pci_autoboot.c
index 3375980919e3fc127da99a2844d35a00d26749ee..243e45026b6c0a715aaacc9e7896769f9c432646 100644 (file)
--- a/src/arch/x86/core/pci_autoboot.c
+++ b/src/arch/x86/core/pci_autoboot.c
@@ -44,5 +44,6 @@ static void pci_autoboot_init ( void ) {
 
 /** PCI autoboot device initialisation function */
 struct init_fn pci_autoboot_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "autoboot",
        .initialise = pci_autoboot_init,
 };

diff --git a/src/arch/x86/core/video_subr.c b/src/arch/x86/core/video_subr.c
index f5cc4cdd4217cae4d821c0e5d7dd2373d0e35e05..4e9ef466ff00fe579dc8be2528f60f70df221574 100644 (file)
--- a/src/arch/x86/core/video_subr.c
+++ b/src/arch/x86/core/video_subr.c
@@ -109,5 +109,6 @@ struct console_driver vga_console __console_driver = {
 };
 
 struct init_fn video_init_fn __init_fn ( INIT_EARLY ) = {
+       .name = "video",
        .initialise = video_init,
 };

diff --git a/src/arch/x86/interface/pcbios/bios_cachedhcp.c b/src/arch/x86/interface/pcbios/bios_cachedhcp.c
index 89785814310ed61e1d9631bc0f04e2832434ed9b..60191c9c56a78064fb8c084766e9b53c8b926d01 100644 (file)
--- a/src/arch/x86/interface/pcbios/bios_cachedhcp.c
+++ b/src/arch/x86/interface/pcbios/bios_cachedhcp.c
@@ -74,5 +74,6 @@ static void cachedhcp_init ( void ) {
 
 /** Cached DHCPACK initialisation function */
 struct init_fn cachedhcp_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "cachedhcp",
        .initialise = cachedhcp_init,
 };

diff --git a/src/arch/x86/interface/pcbios/int13con.c b/src/arch/x86/interface/pcbios/int13con.c
index 8106cd153302d120dd96c8f7b53e302e867e5bd4..925228874fdaf6809ebf4d934d65dd16b35bf696 100644 (file)
--- a/src/arch/x86/interface/pcbios/int13con.c
+++ b/src/arch/x86/interface/pcbios/int13con.c
@@ -288,6 +288,7 @@ static void int13con_init ( void ) {
  * INT13 console initialisation function
  */
 struct init_fn int13con_init_fn __init_fn ( INIT_CONSOLE ) = {
+       .name = "int13con",
        .initialise = int13con_init,
 };
 

diff --git a/src/arch/x86/interface/pcbios/pcicloud.c b/src/arch/x86/interface/pcbios/pcicloud.c
index f7d4a2da15af8ce1281c5a8d1da7eb7a6641fa69..5d4d02ac4357242d0fe810bd5ceb9871a85bf8cd 100644 (file)
--- a/src/arch/x86/interface/pcbios/pcicloud.c
+++ b/src/arch/x86/interface/pcbios/pcicloud.c
@@ -191,5 +191,6 @@ static void pcicloud_init ( void ) {
 
 /** Cloud VM PCI configuration space access initialisation function */
 struct init_fn pcicloud_init_fn __init_fn ( INIT_EARLY ) = {
+       .name = "pcicloud",
        .initialise = pcicloud_init,
 };

diff --git a/src/arch/x86/interface/pxe/pxe_call.c b/src/arch/x86/interface/pxe/pxe_call.c
index a530f919f4b5aa23a061d349b59e312207395bef..9a6a20dd3a3b810293fb5b869dcf6ec4f25deecd 100644 (file)
--- a/src/arch/x86/interface/pxe/pxe_call.c
+++ b/src/arch/x86/interface/pxe/pxe_call.c
@@ -257,6 +257,7 @@ static void pxe_init_structures ( void ) {
 
 /** PXE structure initialiser */
 struct init_fn pxe_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "pxe",
        .initialise = pxe_init_structures,
 };
 

diff --git a/src/arch/x86/interface/vmware/guestinfo.c b/src/arch/x86/interface/vmware/guestinfo.c
index 4134515c1f18b04a32840f3f56c1d0b70a0fe332..c181d96e914640421272f9db21e06e922d3fbfb0 100644 (file)
--- a/src/arch/x86/interface/vmware/guestinfo.c
+++ b/src/arch/x86/interface/vmware/guestinfo.c
@@ -200,6 +200,7 @@ static void guestinfo_init ( void ) {
 
 /** GuestInfo settings initialiser */
 struct init_fn guestinfo_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "guestinfo",
        .initialise = guestinfo_init,
 };
 

diff --git a/src/arch/x86/interface/vmware/vmconsole.c b/src/arch/x86/interface/vmware/vmconsole.c
index f7df4f75ba091ce1088e9f24d7c85961efb91806..3b892c837139ca1f25a7e31582e7f865bb4eb2f5 100644 (file)
--- a/src/arch/x86/interface/vmware/vmconsole.c
+++ b/src/arch/x86/interface/vmware/vmconsole.c
@@ -134,5 +134,6 @@ static void vmconsole_init ( void ) {
  * VMware logfile console initialisation function
  */
 struct init_fn vmconsole_init_fn __init_fn ( INIT_CONSOLE ) = {
+       .name = "vmconsole",
        .initialise = vmconsole_init,
 };

diff --git a/src/core/acpi_settings.c b/src/core/acpi_settings.c
index cdee1f8656ae725120a454b6d4ad65dc76bf78a5..63f27185559ef6a823c7654b77a2e52ac961a6d0 100644 (file)
--- a/src/core/acpi_settings.c
+++ b/src/core/acpi_settings.c
@@ -156,5 +156,6 @@ static void acpi_settings_init ( void ) {
 
 /** ACPI settings initialiser */
 struct init_fn acpi_settings_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "acpi",
        .initialise = acpi_settings_init,
 };

diff --git a/src/core/fnrec.c b/src/core/fnrec.c
index 0430817f876bb751d56c32d7b12fa3ff29cf1e10..b63ffc1f5d3ee686ee2efb4f53baa232dfff6fd8 100644 (file)
--- a/src/core/fnrec.c
+++ b/src/core/fnrec.c
@@ -177,6 +177,7 @@ static void fnrec_init ( void ) {
 }
 
 struct init_fn fnrec_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "fnrec",
        .initialise = fnrec_init,
 };
 

diff --git a/src/core/init.c b/src/core/init.c
index c13fd16679d9059a994d9fbaa365a795d78d6434..406d22d7b96e9f95e673645938406da624f75dd3 100644 (file)
--- a/src/core/init.c
+++ b/src/core/init.c
@@ -53,8 +53,10 @@ void initialise ( void ) {
        struct init_fn *init_fn;
 
        /* Call registered initialisation functions */
-       for_each_table_entry ( init_fn, INIT_FNS )
+       for_each_table_entry ( init_fn, INIT_FNS ) {
+               DBGC ( colour, "INIT initialising %s...\n", init_fn->name );
                init_fn->initialise ();
+       }
 }
 
 /**

diff --git a/src/core/malloc.c b/src/core/malloc.c
index 545927a30971f40b473258bc60edfaa2fe55e0e1..a058710859e342364fa0e33470dfbb5a6754d903 100644 (file)
--- a/src/core/malloc.c
+++ b/src/core/malloc.c
@@ -765,6 +765,7 @@ static void init_heap ( void ) {
 
 /** Memory allocator initialisation function */
 struct init_fn heap_init_fn __init_fn ( INIT_EARLY ) = {
+       .name = "heap",
        .initialise = init_heap,
 };
 

diff --git a/src/core/memmap_settings.c b/src/core/memmap_settings.c
index d07e9747e140dbebdb66c18493b18ecaeea16f3b..f54de915077c82227fe45b5a5697b1d05d39833c 100644 (file)
--- a/src/core/memmap_settings.c
+++ b/src/core/memmap_settings.c
@@ -243,6 +243,7 @@ static void memmap_settings_init ( void ) {
 
 /** Memory map settings initialiser */
 struct init_fn memmap_settings_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "memmap",
        .initialise = memmap_settings_init,
 };
 

diff --git a/src/core/process.c b/src/core/process.c
index 69852c416e22891c9b3564793a37d4803296b679..c944b6f5057954d1d80c269cf0dbfa63f94847bd 100644 (file)
--- a/src/core/process.c
+++ b/src/core/process.c
@@ -133,5 +133,6 @@ static void init_processes ( void ) {
 
 /** Process initialiser */
 struct init_fn process_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "process",
        .initialise = init_processes,
 };

diff --git a/src/core/serial.c b/src/core/serial.c
index 4b569ffad01d3c83bd51c8a3ca709c878488548c..0883ad051b0c43c59df8ea0c292ab2fbb45e874c 100644 (file)
--- a/src/core/serial.c
+++ b/src/core/serial.c
@@ -180,6 +180,7 @@ static void serial_shutdown ( int flags __unused ) {
 
 /** Serial console initialisation function */
 struct init_fn serial_console_init_fn __init_fn ( INIT_CONSOLE ) = {
+       .name = "serial",
        .initialise = serial_init,
 };
 

diff --git a/src/core/settings.c b/src/core/settings.c
index 9fbf753ab1a8f2b6d8161c6d143f74f8607f53bc..05e495dcf00bb9fee791f11097f65779760c73d3 100644 (file)
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -2819,5 +2819,6 @@ static void builtin_init ( void ) {
 
 /** Built-in settings initialiser */
 struct init_fn builtin_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "builtin",
        .initialise = builtin_init,
 };

diff --git a/src/core/timer.c b/src/core/timer.c
index 24745cef746b59fe6c81453e078c1b14e41c4117..d45797adb1a68570ac5f0f52dd412c789f7ba37e 100644 (file)
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -170,6 +170,7 @@ static void timer_probe ( void ) {
 
 /** Timer initialisation function */
 struct init_fn timer_init_fn __init_fn ( INIT_EARLY ) = {
+       .name = "timer",
        .initialise = timer_probe,
 };
 

diff --git a/src/crypto/certstore.c b/src/crypto/certstore.c
index 81179f9cc8205dfdd7699b68cc29f017754b215c..aad874297dae3913c87e34fb3c3264c7182aa9e9 100644 (file)
--- a/src/crypto/certstore.c
+++ b/src/crypto/certstore.c
@@ -210,6 +210,7 @@ static void certstore_init ( void ) {
 
 /** Certificate store initialisation function */
 struct init_fn certstore_init_fn __init_fn ( INIT_LATE ) = {
+       .name = "certstore",
        .initialise = certstore_init,
 };
 

diff --git a/src/crypto/des.c b/src/crypto/des.c
index 6918bec3e282760880fa32f095aa6c2c83e0a569..206f78d50fac1ef7b5fbfb13eca73d842dabcb11 100644 (file)
--- a/src/crypto/des.c
+++ b/src/crypto/des.c
@@ -369,6 +369,7 @@ static void des_init ( void ) {
 
 /** Initialisation function */
 struct init_fn des_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "des",
        .initialise = des_init,
 };
 

diff --git a/src/crypto/x25519.c b/src/crypto/x25519.c
index 995cfa352d73a4be373bdfcc95a9ddda6b6809e0..41bc5fc5e387daec0053d18d43924d20a8e35df2 100644 (file)
--- a/src/crypto/x25519.c
+++ b/src/crypto/x25519.c
@@ -334,6 +334,7 @@ static void x25519_init_constants ( void ) {
 
 /** Initialisation function */
 struct init_fn x25519_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "x25519",
        .initialise = x25519_init_constants,
 };
 

diff --git a/src/drivers/bus/pci_settings.c b/src/drivers/bus/pci_settings.c
index 84aa7682734968dd8c7192898f2e16c3e35026a4..fc73c651e910752157af3ab93cf4c3efdf723e87 100644 (file)
--- a/src/drivers/bus/pci_settings.c
+++ b/src/drivers/bus/pci_settings.c
@@ -125,5 +125,6 @@ static void pci_settings_init ( void ) {
 
 /** PCI device settings initialiser */
 struct init_fn pci_settings_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "pci",
        .initialise = pci_settings_init,
 };

diff --git a/src/drivers/bus/usb_settings.c b/src/drivers/bus/usb_settings.c
index 4fd190d83862d67d426e9434004d69f56610f002..bb01f34d537015782be0d0f933164a14d175ccb9 100644 (file)
--- a/src/drivers/bus/usb_settings.c
+++ b/src/drivers/bus/usb_settings.c
@@ -173,5 +173,6 @@ static void usb_settings_init ( void ) {
 
 /** USB device settings initialiser */
 struct init_fn usb_settings_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "usb",
        .initialise = usb_settings_init,
 };

diff --git a/src/drivers/net/efi/snponly.c b/src/drivers/net/efi/snponly.c
index f0a5277a287970dfbaa5bf57bf603145a216deb1..876479133fdfb92a6f63d26cd196cc0104bc5f47 100644 (file)
--- a/src/drivers/net/efi/snponly.c
+++ b/src/drivers/net/efi/snponly.c
@@ -259,5 +259,6 @@ static void chained_init ( void ) {
 
 /** EFI chainloaded-device-only initialisation function */
 struct init_fn chained_init_fn __init_fn ( INIT_LATE ) = {
+       .name = "chained",
        .initialise = chained_init,
 };

diff --git a/src/image/embedded.c b/src/image/embedded.c
index 2934d4ee79511a8604d96e6095cbe91e2cd6e6d9..652cfc85f0c22a107f25fb51cdbe22d9632394b9 100644 (file)
--- a/src/image/embedded.c
+++ b/src/image/embedded.c
@@ -80,5 +80,6 @@ static void embedded_init ( void ) {
 
 /** Embedded image initialisation function */
 struct init_fn embedded_init_fn __init_fn ( INIT_LATE ) = {
+       .name = "embedded",
        .initialise = embedded_init,
 };

diff --git a/src/include/ipxe/init.h b/src/include/ipxe/init.h
index 32927e3a61ff1ca64544322a7d533c5eeabe8821..da01b29531ae4e61793a2213265e2d514200c300 100644 (file)
--- a/src/include/ipxe/init.h
+++ b/src/include/ipxe/init.h
@@ -12,6 +12,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  * call to initialise().
  */
 struct init_fn {
+       const char *name;
        void ( * initialise ) ( void );
 };
 

diff --git a/src/interface/efi/efi_cacert.c b/src/interface/efi/efi_cacert.c
index 2b6c5c343d0b483944ae07c45fefab85f16002c8..64bb0bae261f6344d8b721db9d3af1c2fd181bbf 100644 (file)
--- a/src/interface/efi/efi_cacert.c
+++ b/src/interface/efi/efi_cacert.c
@@ -178,6 +178,7 @@ static void efi_cacert_init ( void ) {
 
 /** EFI CA certificates initialisation function */
 struct init_fn efi_cacert_init_fn __init_fn ( INIT_LATE ) = {
+       .name = "eficacert",
        .initialise = efi_cacert_init,
 };
 

diff --git a/src/interface/efi/efi_console.c b/src/interface/efi/efi_console.c
index 9fc3c65c0efe0bb106761e5c42ad822198645c75..4557671a0cb0b40f5e0b73f39ba3b6b85ee8ddad 100644 (file)
--- a/src/interface/efi/efi_console.c
+++ b/src/interface/efi/efi_console.c
@@ -448,5 +448,6 @@ static void efi_console_init ( void ) {
  * EFI console initialisation function
  */
 struct init_fn efi_console_init_fn __init_fn ( INIT_EARLY ) = {
+       .name = "eficonsole",
        .initialise = efi_console_init,
 };

diff --git a/src/interface/efi/efi_fdt.c b/src/interface/efi/efi_fdt.c
index 3a90fd7ce4cbb4f4c8e3196b24e720b452e5d3a0..3c249693e674564b27477a500c053c532feca3a1 100644 (file)
--- a/src/interface/efi/efi_fdt.c
+++ b/src/interface/efi/efi_fdt.c
@@ -77,6 +77,7 @@ static void efi_fdt_init ( void ) {
 
 /** EFI Flattened Device Tree initialisation function */
 struct init_fn efi_fdt_init_fn __init_fn ( INIT_EARLY ) = {
+       .name = "efifdt",
        .initialise = efi_fdt_init,
 };
 

diff --git a/src/interface/efi/efi_settings.c b/src/interface/efi/efi_settings.c
index cde0ff8d12d1161988a5cb8c41c175687c64f948..5ddbe12f1f010e37d693c2f8ba46468460c78fd8 100644 (file)
--- a/src/interface/efi/efi_settings.c
+++ b/src/interface/efi/efi_settings.c
@@ -232,5 +232,6 @@ static void efivars_init ( void ) {
 
 /** EFI variable settings initialiser */
 struct init_fn efivars_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "efivars",
        .initialise = efivars_init,
 };

diff --git a/src/interface/efi/efiprefix.c b/src/interface/efi/efiprefix.c
index 10d8f0bf6d156221f45e64c9b6fad63d8c06cce9..ddce6aa60c8a97f813c77ccea6963eddf3327f3e 100644 (file)
--- a/src/interface/efi/efiprefix.c
+++ b/src/interface/efi/efiprefix.c
@@ -98,6 +98,7 @@ static void efi_init_application ( void ) {
 
 /** EFI application initialisation function */
 struct init_fn efi_init_application_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "efi",
        .initialise = efi_init_application,
 };
 

diff --git a/src/interface/smbios/smbios_settings.c b/src/interface/smbios/smbios_settings.c
index 1fe545f3836cf38bf7c5e7d69e4a8b43e416d313..6358a470991a6d0eabccf60bfd6f30e96323fb87 100644 (file)
--- a/src/interface/smbios/smbios_settings.c
+++ b/src/interface/smbios/smbios_settings.c
@@ -200,6 +200,7 @@ static void smbios_init ( void ) {
 
 /** SMBIOS settings initialiser */
 struct init_fn smbios_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "smbios",
        .initialise = smbios_init,
 };
 

diff --git a/src/net/netdev_settings.c b/src/net/netdev_settings.c
index 9432dc2fa8a1d37e2474d188a0f17b750d5ffc1d..90b804c6c29881cbb41014988ae03de73d8a4db5 100644 (file)
--- a/src/net/netdev_settings.c
+++ b/src/net/netdev_settings.c
@@ -429,6 +429,7 @@ static void netdev_redirect_settings_init ( void ) {
 
 /** "netX" settings initialiser */
 struct init_fn netdev_redirect_settings_init_fn __init_fn ( INIT_LATE ) = {
+       .name = "netX",
        .initialise = netdev_redirect_settings_init,
 };
 

diff --git a/src/tests/bofm_test.c b/src/tests/bofm_test.c
index 6d472bc7eb1ad37115577f3987d9f7eeb1ad75e2..bc400284fe749c8ff3ff7353756c2d4ebcfdb84f 100644 (file)
--- a/src/tests/bofm_test.c
+++ b/src/tests/bofm_test.c
@@ -278,5 +278,6 @@ static void bofm_test_init ( void ) {
 
 /** BOFM test initialisation function */
 struct init_fn bofm_test_init_fn __init_fn ( INIT_NORMAL ) = {
+       .name = "bofm",
        .initialise = bofm_test_init,
 };

diff --git a/src/tests/test.c b/src/tests/test.c
index 9fa12e27a9ef627973c765fc32077496a59b228f..e4f5eb838b133ce1918a9df706a8ac1126f9ff59 100644 (file)
--- a/src/tests/test.c
+++ b/src/tests/test.c
@@ -180,5 +180,6 @@ static void test_init ( void ) {
 
 /** Self-test initialisation function */
 struct init_fn test_init_fn __init_fn ( INIT_EARLY ) = {
+       .name = "test",
        .initialise = test_init,
 };