[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/36] linux-user: Replace bprm->fd with bprm->src.fd
From: |
Richard Henderson |
Subject: |
[PATCH v2 08/36] linux-user: Replace bprm->fd with bprm->src.fd |
Date: |
Tue, 6 Jul 2021 16:49:04 -0700 |
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>
---
linux-user/qemu.h | 1 -
linux-user/flatload.c | 8 ++++----
linux-user/linuxload.c | 5 ++---
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index f4cdfb16b3..dafaae6293 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -211,7 +211,6 @@ struct linux_binprm {
char buf[BPRM_BUF_SIZE] __attribute__((aligned));
ImageSource src;
abi_ulong p;
- int fd;
int e_uid, e_gid;
int argc, envc;
char **argv;
diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index 3e5594cf89..58d0d9352c 100644
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -460,7 +460,7 @@ static int load_flat_file(struct linux_binprm * bprm,
DBG_FLT("BINFMT_FLAT: ROM mapping of file (we hope)\n");
textpos = target_mmap(0, text_len, PROT_READ|PROT_EXEC,
- MAP_PRIVATE, bprm->fd, 0);
+ MAP_PRIVATE, bprm->src.fd, 0);
if (textpos == -1) {
fprintf(stderr, "Unable to mmap process text\n");
return -1;
@@ -487,7 +487,7 @@ static int load_flat_file(struct linux_binprm * bprm,
} else
#endif
{
- result = target_pread(bprm->fd, datapos,
+ result = target_pread(bprm->src.fd, datapos,
data_len + (relocs * sizeof(abi_ulong)),
fpos);
}
@@ -537,10 +537,10 @@ static int load_flat_file(struct linux_binprm * bprm,
else
#endif
{
- result = target_pread(bprm->fd, textpos,
+ result = target_pread(bprm->src.fd, textpos,
text_len, 0);
if (result >= 0) {
- result = target_pread(bprm->fd, datapos,
+ result = target_pread(bprm->src.fd, datapos,
data_len + (relocs * sizeof(abi_ulong)),
ntohl(hdr->data_start));
}
diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c
index 8b93b9704c..d0d3f2ed0e 100644
--- a/linux-user/linuxload.c
+++ b/linux-user/linuxload.c
@@ -36,7 +36,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
int mode;
int retval;
- if (fstat(bprm->fd, &st) < 0) {
+ if (fstat(bprm->src.fd, &st) < 0) {
return -errno;
}
@@ -66,7 +66,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
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) {
perror("prepare_binprm");
exit(-1);
@@ -133,7 +133,6 @@ int loader_exec(int fdexec, const char *filename, char
**argv, char **envp,
{
int retval;
- bprm->fd = fdexec;
bprm->src.fd = fdexec;
bprm->filename = (char *)filename;
bprm->argc = count(argv);
--
2.25.1
- [PATCH v2 00/36] linux-user: Signal trampolines and vdsos, Richard Henderson, 2021/07/06
- [PATCH v2 01/36] linux-user: Add infrastructure for a signal trampoline page, Richard Henderson, 2021/07/06
- [PATCH v2 04/36] linux-user: Tidy loader_exec, Richard Henderson, 2021/07/06
- [PATCH v2 02/36] linux-user: Fix style problems in linuxload.c, Richard Henderson, 2021/07/06
- [PATCH v2 07/36] linux-user: Use ImageSource in load_symbols, Richard Henderson, 2021/07/06
- [PATCH v2 06/36] linux-user: Use ImageSource in load_elf_image, Richard Henderson, 2021/07/06
- [PATCH v2 05/36] linux-user: Do not clobber bprm_buf swapping ehdr, Richard Henderson, 2021/07/06
- [PATCH v2 03/36] linux-user: Introduce imgsrc_read, imgsrc_read_alloc, Richard Henderson, 2021/07/06
- [PATCH v2 08/36] linux-user: Replace bprm->fd with bprm->src.fd,
Richard Henderson <=
- [PATCH v2 09/36] linux-user: Introduce imgsrc_mmap, Richard Henderson, 2021/07/06
- [PATCH v2 10/36] linux-user: Load vdso image if available, Richard Henderson, 2021/07/06
- [PATCH v2 11/36] linux-user: Add gen-vdso tool, Richard Henderson, 2021/07/06
- [PATCH v2 13/36] linux-user/arm: Drop v1 signal frames, Richard Henderson, 2021/07/06
- [PATCH v2 14/36] linux-user/arm: Drop "_v2" from symbols in signal.c, Richard Henderson, 2021/07/06
- [PATCH v2 12/36] linux-user/aarch64: Add vdso and use it for rt_sigreturn, Richard Henderson, 2021/07/06
- [PATCH v2 15/36] target/arm: Add isar_feature_aa32_a32, Richard Henderson, 2021/07/06