yannick.naumann/RT-Task-Generator-QEMU
1
0
Fork 0
forked from alwin.berger/FRET-qemu
Code Pull Requests Activity

linux-user: Replace bprm->fd with bprm->src.fd

Browse Source 
There are only a couple of uses of bprm->fd remaining.
Migrate to the other field.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-06-16 21:08:15 -07:00
parent 86cf82dc9f
commit d0b6b79323
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux-user/flatload.c
View File

@ -463,7 +463,7 @@ static int load_flat_file(struct linux_binprm * bprm,
DBG_FLT("BINFMT_FLAT: ROM mapping of file (we hope)\n"); DBG_FLT("BINFMT_FLAT: ROM mapping of file (we hope)\n");
textpos = target_mmap(0, text_len, PROT_READ|PROT_EXEC, textpos = target_mmap(0, text_len, PROT_READ|PROT_EXEC,
MAP_PRIVATE, bprm->fd, 0); MAP_PRIVATE, bprm->src.fd, 0);
if (textpos == -1) { if (textpos == -1) {
fprintf(stderr, "Unable to mmap process text\n"); fprintf(stderr, "Unable to mmap process text\n");
return -1; return -1;
@ -490,7 +490,7 @@ static int load_flat_file(struct linux_binprm * bprm,
} else } else
#endif #endif
{ {
result = target_pread(bprm->fd, datapos, result = target_pread(bprm->src.fd, datapos,
data_len + (relocs * sizeof(abi_ulong)), data_len + (relocs * sizeof(abi_ulong)),
fpos); fpos);
} }
@ -540,10 +540,10 @@ static int load_flat_file(struct linux_binprm * bprm,
else else
#endif #endif
{ {
result = target_pread(bprm->fd, textpos, result = target_pread(bprm->src.fd, textpos,
text_len, 0); text_len, 0);
if (result >= 0) { if (result >= 0) {
result = target_pread(bprm->fd, datapos, result = target_pread(bprm->src.fd, datapos,
data_len + (relocs * sizeof(abi_ulong)), data_len + (relocs * sizeof(abi_ulong)),
ntohl(hdr->data_start)); ntohl(hdr->data_start));
} }

5
linux-user/linuxload.c
View File

@ -39,7 +39,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
int mode; int mode;
int retval; int retval;
if (fstat(bprm->fd, &st) < 0) { if (fstat(bprm->src.fd, &st) < 0) {
return -errno; return -errno;
} }
@ -69,7 +69,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
bprm->e_gid = st.st_gid; bprm->e_gid = st.st_gid;
} }
retval = read(bprm->fd, bprm->buf, BPRM_BUF_SIZE); retval = read(bprm->src.fd, bprm->buf, BPRM_BUF_SIZE);
if (retval < 0) { if (retval < 0) {
perror("prepare_binprm"); perror("prepare_binprm");
exit(-1); exit(-1);
@ -144,7 +144,6 @@ int loader_exec(int fdexec, const char *filename, char **argv, char **envp,
{ {
int retval; int retval;
bprm->fd = fdexec;
bprm->src.fd = fdexec; bprm->src.fd = fdexec;
bprm->filename = (char *)filename; bprm->filename = (char *)filename;
bprm->argc = count(argv); bprm->argc = count(argv);

1
linux-user/loader.h
View File

@ -74,7 +74,6 @@ struct linux_binprm {
char buf[BPRM_BUF_SIZE] __attribute__((aligned)); char buf[BPRM_BUF_SIZE] __attribute__((aligned));
ImageSource src; ImageSource src;
abi_ulong p; abi_ulong p;
int fd;
int e_uid, e_gid; int e_uid, e_gid;
int argc, envc; int argc, envc;
char **argv; char **argv;