git: 8e8d7d489f7b - main - loader: Use C99 initializations for file_format
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 28 Dec 2025 05:48:54 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=8e8d7d489f7ba169b78b21fb84f8b4666fa871b8
commit 8e8d7d489f7ba169b78b21fb84f8b4666fa871b8
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2025-12-28 05:37:56 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-12-28 05:37:56 +0000
loader: Use C99 initializations for file_format
For greppability, use C99 initializers for the struct file_format.
Sponsored by: Netflix
---
stand/efi/loader/arch/amd64/multiboot2.c | 10 ++++++++--
stand/efi/loader/arch/arm/exec.c | 4 ++--
stand/efi/loader/arch/arm64/exec.c | 4 ++--
stand/efi/loader/arch/riscv/exec.c | 4 ++--
stand/i386/libi386/elf32_freebsd.c | 10 ++++++++--
stand/i386/libi386/elf64_freebsd.c | 10 ++++++++--
stand/i386/libi386/multiboot.c | 11 ++++++++---
stand/kboot/kboot/arch/aarch64/exec.c | 4 ++--
stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c | 7 +++----
stand/powerpc/ofw/elf_freebsd.c | 7 +++----
stand/powerpc/ofw/ppc64_elf_freebsd.c | 7 +++----
stand/uboot/arch/powerpc/ppc64_elf_freebsd.c | 7 +++----
stand/uboot/elf_freebsd.c | 4 ++--
stand/userboot/userboot/elf32_freebsd.c | 10 ++++++++--
stand/userboot/userboot/elf64_freebsd.c | 10 ++++++++--
15 files changed, 70 insertions(+), 39 deletions(-)
diff --git a/stand/efi/loader/arch/amd64/multiboot2.c b/stand/efi/loader/arch/amd64/multiboot2.c
index 086dba33895a..b1c60601a8bd 100644
--- a/stand/efi/loader/arch/amd64/multiboot2.c
+++ b/stand/efi/loader/arch/amd64/multiboot2.c
@@ -558,5 +558,11 @@ obj_exec(struct preloaded_file *fp)
return (EFTYPE);
}
-struct file_format multiboot2 = { loadfile, exec };
-struct file_format multiboot2_obj = { obj_loadfile, obj_exec };
+struct file_format multiboot2 = {
+ .l_load = loadfile,
+ .l_exec = exec
+};
+struct file_format multiboot2_obj = {
+ .l_load = obj_loadfile,
+ .l_exec = obj_exec
+};
diff --git a/stand/efi/loader/arch/arm/exec.c b/stand/efi/loader/arch/arm/exec.c
index 3963b6c0104b..50e94af05fd2 100644
--- a/stand/efi/loader/arch/arm/exec.c
+++ b/stand/efi/loader/arch/arm/exec.c
@@ -90,8 +90,8 @@ __elfN(arm_exec)(struct preloaded_file *fp)
}
static struct file_format arm_elf = {
- __elfN(arm_load),
- __elfN(arm_exec)
+ .l_load = __elfN(arm_load),
+ .l_exec = __elfN(arm_exec)
};
struct file_format *file_formats[] = {
diff --git a/stand/efi/loader/arch/arm64/exec.c b/stand/efi/loader/arch/arm64/exec.c
index 89e2ad7521a8..6b5181b54507 100644
--- a/stand/efi/loader/arch/arm64/exec.c
+++ b/stand/efi/loader/arch/arm64/exec.c
@@ -43,8 +43,8 @@ static int elf64_exec(struct preloaded_file *amp);
static int elf64_obj_exec(struct preloaded_file *amp);
static struct file_format arm64_elf = {
- elf64_loadfile,
- elf64_exec
+ .l_load = elf64_loadfile,
+ .l_exec = elf64_exec
};
struct file_format *file_formats[] = {
diff --git a/stand/efi/loader/arch/riscv/exec.c b/stand/efi/loader/arch/riscv/exec.c
index 8d1a0bd03de0..64e522775471 100644
--- a/stand/efi/loader/arch/riscv/exec.c
+++ b/stand/efi/loader/arch/riscv/exec.c
@@ -106,8 +106,8 @@ __elfN(exec)(struct preloaded_file *fp)
}
static struct file_format riscv_elf = {
- __elfN(loadfile),
- __elfN(exec)
+ .l_load = __elfN(loadfile),
+ .l_exec = __elfN(exec)
};
struct file_format *file_formats[] = {
diff --git a/stand/i386/libi386/elf32_freebsd.c b/stand/i386/libi386/elf32_freebsd.c
index ae5702e5e65f..40111bdd4d6c 100644
--- a/stand/i386/libi386/elf32_freebsd.c
+++ b/stand/i386/libi386/elf32_freebsd.c
@@ -39,8 +39,14 @@
static int elf32_exec(struct preloaded_file *amp);
static int elf32_obj_exec(struct preloaded_file *amp);
-struct file_format i386_elf = { elf32_loadfile, elf32_exec };
-struct file_format i386_elf_obj = { elf32_obj_loadfile, elf32_obj_exec };
+struct file_format i386_elf = {
+ .l_load = elf32_loadfile,
+ .l_exec = elf32_exec
+};
+struct file_format i386_elf_obj = {
+ .l_load = elf32_obj_loadfile,
+ .l_exec = elf32_obj_exec
+};
/*
* There is an ELF kernel and one or more ELF modules loaded.
diff --git a/stand/i386/libi386/elf64_freebsd.c b/stand/i386/libi386/elf64_freebsd.c
index 89cc249e9d96..73d1ad088824 100644
--- a/stand/i386/libi386/elf64_freebsd.c
+++ b/stand/i386/libi386/elf64_freebsd.c
@@ -43,8 +43,14 @@
static int elf64_exec(struct preloaded_file *amp);
static int elf64_obj_exec(struct preloaded_file *amp);
-struct file_format amd64_elf = { elf64_loadfile, elf64_exec };
-struct file_format amd64_elf_obj = { elf64_obj_loadfile, elf64_obj_exec };
+struct file_format amd64_elf = {
+ .l_load = elf64_loadfile,
+ .l_exec = elf64_exec
+};
+struct file_format amd64_elf_obj = {
+ .l_load = elf64_obj_loadfile,
+ .l_exec = elf64_obj_exec
+};
/*
* i386's pmap_pae.h doesn't provide this, so
diff --git a/stand/i386/libi386/multiboot.c b/stand/i386/libi386/multiboot.c
index e2bd44fe83f5..f30787ecebe0 100644
--- a/stand/i386/libi386/multiboot.c
+++ b/stand/i386/libi386/multiboot.c
@@ -67,9 +67,14 @@ static int multiboot_exec(struct preloaded_file *);
static int multiboot_obj_loadfile(char *, uint64_t, struct preloaded_file **);
static int multiboot_obj_exec(struct preloaded_file *fp);
-struct file_format multiboot = { multiboot_loadfile, multiboot_exec };
-struct file_format multiboot_obj =
- { multiboot_obj_loadfile, multiboot_obj_exec };
+struct file_format multiboot = {
+ .l_load = multiboot_loadfile,
+ .l_exec = multiboot_exec
+};
+struct file_format multiboot_obj = {
+ .l_load = multiboot_obj_loadfile,
+ .l_exec = multiboot_obj_exec
+};
extern void multiboot_tramp();
diff --git a/stand/kboot/kboot/arch/aarch64/exec.c b/stand/kboot/kboot/arch/aarch64/exec.c
index df3e922dfe11..bc7cd6917e13 100644
--- a/stand/kboot/kboot/arch/aarch64/exec.c
+++ b/stand/kboot/kboot/arch/aarch64/exec.c
@@ -73,8 +73,8 @@ int bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp,
#endif
static struct file_format arm64_elf = {
- elf64_loadfile,
- elf64_exec
+ .l_load = elf64_loadfile,
+ .l_exec = elf64_exec
};
struct file_format *file_formats[] = {
diff --git a/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c
index ae398e357df2..65c43a411433 100644
--- a/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c
+++ b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c
@@ -157,10 +157,9 @@ ppc64_elf_exec(struct preloaded_file *fp)
while (1) {}
}
-struct file_format ppc_elf64 =
-{
- ppc64_elf_loadfile,
- ppc64_elf_exec
+struct file_format ppc_elf64 = {
+ .l_load = ppc64_elf_loadfile,
+ .l_exec = ppc64_elf_exec
};
/*
diff --git a/stand/powerpc/ofw/elf_freebsd.c b/stand/powerpc/ofw/elf_freebsd.c
index 4d34fa18c5dd..5f8d84ac8bec 100644
--- a/stand/powerpc/ofw/elf_freebsd.c
+++ b/stand/powerpc/ofw/elf_freebsd.c
@@ -97,8 +97,7 @@ __elfN(ofw_exec)(struct preloaded_file *fp)
panic("exec returned");
}
-struct file_format ofw_elf =
-{
- __elfN(ofw_loadfile),
- __elfN(ofw_exec)
+struct file_format ofw_elf = {
+ .l_load = __elfN(ofw_loadfile),
+ .l_exec = __elfN(ofw_exec)
};
diff --git a/stand/powerpc/ofw/ppc64_elf_freebsd.c b/stand/powerpc/ofw/ppc64_elf_freebsd.c
index bc68d129f353..92d394963678 100644
--- a/stand/powerpc/ofw/ppc64_elf_freebsd.c
+++ b/stand/powerpc/ofw/ppc64_elf_freebsd.c
@@ -101,8 +101,7 @@ ppc64_ofw_elf_exec(struct preloaded_file *fp)
panic("exec returned");
}
-struct file_format ofw_elf64 =
-{
- ppc64_ofw_elf_loadfile,
- ppc64_ofw_elf_exec
+struct file_format ofw_elf64 = {
+ .l_load = ppc64_ofw_elf_loadfile,
+ .l_exec = ppc64_ofw_elf_exec
};
diff --git a/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c b/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c
index e500b862de2e..1df64d166840 100644
--- a/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c
+++ b/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c
@@ -88,8 +88,7 @@ ppc64_uboot_elf_exec(struct preloaded_file *fp)
panic("exec returned");
}
-struct file_format uboot_elf64 =
-{
- ppc64_uboot_elf_loadfile,
- ppc64_uboot_elf_exec
+struct file_format uboot_elf64 = {
+ .l_load = ppc64_uboot_elf_loadfile,
+ .l_exec = ppc64_uboot_elf_exec
};
diff --git a/stand/uboot/elf_freebsd.c b/stand/uboot/elf_freebsd.c
index 3b1bdc542538..772ba32bb7b7 100644
--- a/stand/uboot/elf_freebsd.c
+++ b/stand/uboot/elf_freebsd.c
@@ -87,6 +87,6 @@ __elfN(uboot_exec)(struct preloaded_file *fp)
}
struct file_format uboot_elf = {
- __elfN(uboot_load),
- __elfN(uboot_exec)
+ .l_load = __elfN(uboot_load),
+ .l_exec = __elfN(uboot_exec)
};
diff --git a/stand/userboot/userboot/elf32_freebsd.c b/stand/userboot/userboot/elf32_freebsd.c
index c2492dce7397..984218f419d9 100644
--- a/stand/userboot/userboot/elf32_freebsd.c
+++ b/stand/userboot/userboot/elf32_freebsd.c
@@ -39,8 +39,14 @@
static int elf32_exec(struct preloaded_file *amp);
static int elf32_obj_exec(struct preloaded_file *amp);
-struct file_format i386_elf = { elf32_loadfile, elf32_exec };
-struct file_format i386_elf_obj = { elf32_obj_loadfile, elf32_obj_exec };
+struct file_format i386_elf = {
+ .l_load = elf32_loadfile,
+ .l_exec = elf32_exec
+};
+struct file_format i386_elf_obj = {
+ .l_load = elf32_obj_loadfile,
+ .l_exec = elf32_obj_exec
+};
#define GUEST_STACK 0x1000 /* Initial stack base */
#define GUEST_GDT 0x3000 /* Address of initial GDT */
diff --git a/stand/userboot/userboot/elf64_freebsd.c b/stand/userboot/userboot/elf64_freebsd.c
index 5a63fdb4990c..b4cbefd07aad 100644
--- a/stand/userboot/userboot/elf64_freebsd.c
+++ b/stand/userboot/userboot/elf64_freebsd.c
@@ -43,8 +43,14 @@
static int elf64_exec(struct preloaded_file *amp);
static int elf64_obj_exec(struct preloaded_file *amp);
-struct file_format amd64_elf = { elf64_loadfile, elf64_exec };
-struct file_format amd64_elf_obj = { elf64_obj_loadfile, elf64_obj_exec };
+struct file_format amd64_elf = {
+ .l_load = elf64_loadfile,
+ .l_exec = elf64_exec
+};
+struct file_format amd64_elf_obj = {
+ .l_load = elf64_obj_loadfile,
+ .l_exec = elf64_obj_exec
+};
#define GUEST_NULL_SEL 0
#define GUEST_CODE_SEL 1