kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-11 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

loader: Use C99 initializations for file_format

Browse source 
For greppability, use C99 initializers for the struct file_format.

Sponsored by:		Netflix
This commit is contained in:
Warner Losh 2025-12-27 22:37:56 -07:00
parent 424089a0fc
commit 8e8d7d489f
15 changed files with 70 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
stand/efi/loader/arch/amd64/multiboot2.c
View file

@ -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
};

4
stand/efi/loader/arch/arm/exec.c
View file

@ -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[] = {

4
stand/efi/loader/arch/arm64/exec.c
View file

@ -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[] = {

4
stand/efi/loader/arch/riscv/exec.c
View file

@ -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[] = {

10
stand/i386/libi386/elf32_freebsd.c
View file

@ -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.

10
stand/i386/libi386/elf64_freebsd.c
View file

@ -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

11
stand/i386/libi386/multiboot.c
View file

@ -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();

4
stand/kboot/kboot/arch/aarch64/exec.c
View file

@ -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[] = {

7
stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c
View file

@ -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
};
/*

7
stand/powerpc/ofw/elf_freebsd.c
View file

@ -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)
};

7
stand/powerpc/ofw/ppc64_elf_freebsd.c
View file

@ -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
};

7
stand/uboot/arch/powerpc/ppc64_elf_freebsd.c
View file

@ -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
};

4
stand/uboot/elf_freebsd.c
View file

@ -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)
};

10
stand/userboot/userboot/elf32_freebsd.c
View file

@ -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 */

10
stand/userboot/userboot/elf64_freebsd.c
View file

@ -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