From afcbcff80bf81a3399e24c7908b17776e1489df9 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 29 Apr 2021 10:04:28 -0600 Subject: [PATCH] bsd-user: rename linux_binprm to bsd_binprm Rename linux_binprm to bsd_binprm to reflect that we're loading BSD binaries, not ELF ones. Reviewed-by: Richard Henderson Signed-off-by: Warner Losh --- bsd-user/bsdload.c | 4 ++-- bsd-user/elfload.c | 4 ++-- bsd-user/qemu.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index e1ed3b7b60..8d83f21eda 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -32,7 +32,7 @@ static int count(char **vec) return i; } -static int prepare_binprm(struct linux_binprm *bprm) +static int prepare_binprm(struct bsd_binprm *bprm) { struct stat st; int mode; @@ -127,7 +127,7 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp, int loader_exec(const char *filename, char **argv, char **envp, struct target_pt_regs *regs, struct image_info *infop) { - struct linux_binprm bprm; + struct bsd_binprm bprm; int retval; int i; diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 3c9d8c2845..6edceb3ea6 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -662,7 +662,7 @@ static abi_ulong copy_elf_strings(int argc, char **argv, void **page, return p; } -static abi_ulong setup_arg_pages(abi_ulong p, struct linux_binprm *bprm, +static abi_ulong setup_arg_pages(abi_ulong p, struct bsd_binprm *bprm, struct image_info *info) { abi_ulong stack_base, size, error; @@ -1143,7 +1143,7 @@ static void load_symbols(struct elfhdr *hdr, int fd) syminfos = s; } -int load_elf_binary(struct linux_binprm *bprm, struct target_pt_regs *regs, +int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, struct image_info *info) { struct elfhdr elf_ex; diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index eb66d15df7..c02e8a5ca1 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -115,7 +115,7 @@ extern unsigned long mmap_min_addr; * This structure is used to hold the arguments that are * used when loading binaries. */ -struct linux_binprm { +struct bsd_binprm { char buf[128]; void *page[MAX_ARG_PAGES]; abi_ulong p; @@ -133,9 +133,9 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp, int loader_exec(const char *filename, char **argv, char **envp, struct target_pt_regs *regs, struct image_info *infop); -int load_elf_binary(struct linux_binprm *bprm, struct target_pt_regs *regs, +int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, struct image_info *info); -int load_flt_binary(struct linux_binprm *bprm, struct target_pt_regs *regs, +int load_flt_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, struct image_info *info); abi_long memcpy_to_target(abi_ulong dest, const void *src,