[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 01/15] linux-user: remove useless variable
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL v2 01/15] linux-user: remove useless variable |
Date: |
Wed, 11 Sep 2019 08:49:06 +0200 |
filename is only used to open the file if AT_EXECFD is not provided.
But exec_path already contains the path of the file to open.
Remove filename as it is only used in main.c whereas exec_path is
also used in syscall.c.
Fixes: d088d664f201 ("linux-user: identify running binary in /proc/self/exe")
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/main.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index 47917bbb20fc..28f0065b6ddf 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -49,7 +49,6 @@
char *exec_path;
int singlestep;
-static const char *filename;
static const char *argv0;
static int gdbstub_port;
static envlist_t *envlist;
@@ -586,7 +585,6 @@ static int parse_args(int argc, char **argv)
exit(EXIT_FAILURE);
}
- filename = argv[optind];
exec_path = argv[optind];
return optind;
@@ -657,9 +655,9 @@ int main(int argc, char **argv, char **envp)
execfd = qemu_getauxval(AT_EXECFD);
if (execfd == 0) {
- execfd = open(filename, O_RDONLY);
+ execfd = open(exec_path, O_RDONLY);
if (execfd < 0) {
- printf("Error while loading %s: %s\n", filename, strerror(errno));
+ printf("Error while loading %s: %s\n", exec_path, strerror(errno));
_exit(EXIT_FAILURE);
}
}
@@ -784,10 +782,10 @@ int main(int argc, char **argv, char **envp)
cpu->opaque = ts;
task_settid(ts);
- ret = loader_exec(execfd, filename, target_argv, target_environ, regs,
+ ret = loader_exec(execfd, exec_path, target_argv, target_environ, regs,
info, &bprm);
if (ret != 0) {
- printf("Error while loading %s: %s\n", filename, strerror(-ret));
+ printf("Error while loading %s: %s\n", exec_path, strerror(-ret));
_exit(EXIT_FAILURE);
}
--
2.21.0
- [Qemu-devel] [PULL v2 02/15] linux-user: Add AT_HWCAP2 for aarch64-linux-user, (continued)
- [Qemu-devel] [PULL v2 02/15] linux-user: Add AT_HWCAP2 for aarch64-linux-user, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 03/15] linux-user: erroneous fd_trans_unregister call, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 04/15] linux-user: fail and report on bad dfilter specs, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 07/15] linux-user/arm: Adjust MAX_RESERVED_VA for M-profile, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 13/15] linux-user: Add support for FDFLUSH ioctl, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 05/15] linux-user: add memfd_create, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 06/15] linux-user: Pass CPUState to MAX_RESERVED_VA, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 08/15] linux-user: Support gdb 'qOffsets' query for ELF, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 09/15] target/xtensa: linux-user: add call0 ABI support, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 11/15] linux-user: Add support for RNDRESEEDCRNG ioctl, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 01/15] linux-user: remove useless variable,
Laurent Vivier <=
- [Qemu-devel] [PULL v2 10/15] linux-user: drop redundant handling of environment variables, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 12/15] linux-user: Add support for FIOGETOWN and FIOSETOWN ioctls, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 15/15] linux-user: Add support for FDRESET, FDRAWCMD, FDTWADDLE, and FDEJECT ioctls, Laurent Vivier, 2019/09/11
- [Qemu-devel] [PULL v2 14/15] linux-user: Add support for FDMSGON and FDMSGOFF ioctls, Laurent Vivier, 2019/09/11
- Re: [Qemu-devel] [PULL v2 00/15] Linux user for 4.2 patches, Peter Maydell, 2019/09/12