[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for 6.2 10/49] bsd-user: pass the bsd_param into loader_exec
From: |
Warner Losh |
Subject: |
[PATCH for 6.2 10/49] bsd-user: pass the bsd_param into loader_exec |
Date: |
Sat, 7 Aug 2021 15:42:03 -0600 |
Pass the bsd_param into loader_exec, and adjust.
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/bsdload.c | 37 +++++++++++++++++++------------------
bsd-user/main.c | 7 ++++++-
bsd-user/qemu.h | 3 ++-
3 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c
index ec71c5e923..5282a7c4f2 100644
--- a/bsd-user/bsdload.c
+++ b/bsd-user/bsdload.c
@@ -140,35 +140,36 @@ 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 target_pt_regs *regs, struct image_info *infop,
+ struct bsd_binprm *bprm)
{
- struct bsd_binprm bprm;
int retval;
int i;
- bprm.p = TARGET_PAGE_SIZE * MAX_ARG_PAGES - sizeof(unsigned int);
- for (i = 0 ; i < MAX_ARG_PAGES ; i++) { /* clear page-table */
- bprm.page[i] = NULL;
+ bprm->p = TARGET_PAGE_SIZE * MAX_ARG_PAGES - sizeof(unsigned int);
+ for (i = 0; i < MAX_ARG_PAGES; i++) { /* clear page-table */
+ bprm->page[i] = NULL;
}
retval = open(filename, O_RDONLY);
if (retval < 0) {
return retval;
}
- bprm.fd = retval;
- bprm.filename = (char *)filename;
- bprm.argc = count(argv);
- bprm.argv = argv;
- bprm.envc = count(envp);
- bprm.envp = envp;
- retval = prepare_binprm(&bprm);
+ bprm->fd = retval;
+ bprm->filename = (char *)filename;
+ bprm->argc = count(argv);
+ bprm->argv = argv;
+ bprm->envc = count(envp);
+ bprm->envp = envp;
+
+ retval = prepare_binprm(bprm);
if (retval >= 0) {
- if (bprm.buf[0] == 0x7f
- && bprm.buf[1] == 'E'
- && bprm.buf[2] == 'L'
- && bprm.buf[3] == 'F') {
- retval = load_elf_binary(&bprm, regs, infop);
+ if (bprm->buf[0] == 0x7f
+ && bprm->buf[1] == 'E'
+ && bprm->buf[2] == 'L'
+ && bprm->buf[3] == 'F') {
+ retval = load_elf_binary(bprm, regs, infop);
} else {
fprintf(stderr, "Unknown binary format\n");
return -1;
@@ -183,7 +184,7 @@ int loader_exec(const char *filename, char **argv, char
**envp,
/* Something went wrong, return the inode and free the argument pages*/
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
- g_free(bprm.page[i]);
+ g_free(bprm->page[i]);
}
return retval;
}
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 5c579d7c2c..65958729f1 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -343,6 +343,7 @@ int main(int argc, char **argv)
const char *log_mask = NULL;
struct target_pt_regs regs1, *regs = ®s1;
struct image_info info1, *info = &info1;
+ struct bsd_binprm bprm;
TaskState ts1, *ts = &ts1;
CPUArchState *env;
CPUState *cpu;
@@ -499,6 +500,9 @@ int main(int argc, char **argv)
/* Zero out regs */
memset(regs, 0, sizeof(struct target_pt_regs));
+ /* Zero bsd params */
+ memset(&bprm, 0, sizeof(bprm));
+
/* Zero out image_info */
memset(info, 0, sizeof(struct image_info));
@@ -565,7 +569,8 @@ int main(int argc, char **argv)
}
}
- if (loader_exec(filename, argv + optind, target_environ, regs, info) != 0)
{
+ if (loader_exec(filename, argv+optind, target_environ, regs, info,
+ &bprm) != 0) {
printf("Error loading %s\n", filename);
_exit(1);
}
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index c02e8a5ca1..5237e35f9c 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -131,7 +131,8 @@ void do_init_thread(struct target_pt_regs *regs, struct
image_info *infop);
abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp,
abi_ulong stringp, int push_ptr);
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 bsd_binprm *bprm);
int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs,
struct image_info *info);
--
2.32.0
- [PATCH for 6.2 05/49] bsd-user: move arch specific defines out of elfload.c, (continued)
- [PATCH for 6.2 05/49] bsd-user: move arch specific defines out of elfload.c, Warner Losh, 2021/08/07
- [PATCH for 6.2 07/49] bsd-user: style nits: apply qemu style to these files, Warner Losh, 2021/08/07
- [PATCH for 6.2 06/49] bsd-user: merge comments and guards from bsd-user fork, Warner Losh, 2021/08/07
- [PATCH for 6.2 08/49] bsd-user: style nits: fix whitespace issues to be qemu standard, Warner Losh, 2021/08/07
- [PATCH for 6.2 09/49] bsd-user: add license, Warner Losh, 2021/08/07
- [PATCH for 6.2 10/49] bsd-user: pass the bsd_param into loader_exec,
Warner Losh <=
- [PATCH for 6.2 11/49] bsd-user: Fix calculation of size to allocate, Warner Losh, 2021/08/07
- [PATCH for 6.2 12/49] bsd-user: implement path searching, Warner Losh, 2021/08/07
- [PATCH for 6.2 13/49] bsd-user: Eliminate elf personality, Warner Losh, 2021/08/07
- [PATCH for 6.2 14/49] bsd-user: remove a.out support, Warner Losh, 2021/08/07