OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

bsd-user: rename linux_binprm to bsd_binprm

Browse Source 
Rename linux_binprm to bsd_binprm to reflect that we're loading BSD binaries,
not ELF ones.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
This commit is contained in:
Warner Losh 2021-04-29 10:04:28 -06:00
parent f8ce39701b
commit afcbcff80b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsd-user/bsdload.c
View File

@ -32,7 +32,7 @@ static int count(char **vec)
return i; return i;
} }
static int prepare_binprm(struct linux_binprm *bprm) static int prepare_binprm(struct bsd_binprm *bprm)
{ {
struct stat st; struct stat st;
int mode; 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, int loader_exec(const char *filename, char **argv, char **envp,
struct target_pt_regs *regs, struct image_info *infop) struct target_pt_regs *regs, struct image_info *infop)
{ {
struct linux_binprm bprm; struct bsd_binprm bprm;
int retval; int retval;
int i; int i;

4
bsd-user/elfload.c
View File

@ -662,7 +662,7 @@ static abi_ulong copy_elf_strings(int argc, char **argv, void **page,
return p; 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) struct image_info *info)
{ {
abi_ulong stack_base, size, error; abi_ulong stack_base, size, error;
@ -1143,7 +1143,7 @@ static void load_symbols(struct elfhdr *hdr, int fd)
syminfos = s; 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 image_info *info)
{ {
struct elfhdr elf_ex; struct elfhdr elf_ex;

6
bsd-user/qemu.h
View File

@ -115,7 +115,7 @@ extern unsigned long mmap_min_addr;
* This structure is used to hold the arguments that are * This structure is used to hold the arguments that are
* used when loading binaries. * used when loading binaries.
*/ */
struct linux_binprm { struct bsd_binprm {
char buf[128]; char buf[128];
void *page[MAX_ARG_PAGES]; void *page[MAX_ARG_PAGES];
abi_ulong p; 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, int loader_exec(const char *filename, char **argv, char **envp,
struct target_pt_regs *regs, struct image_info *infop); 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); 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); struct image_info *info);
abi_long memcpy_to_target(abi_ulong dest, const void *src, abi_long memcpy_to_target(abi_ulong dest, const void *src,