[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 1/2] linux-user: remove useless variable
From: |
Laurent Vivier |
Subject: |
Re: [Qemu-devel] [PATCH v2 1/2] linux-user: remove useless variable |
Date: |
Tue, 10 Sep 2019 10:29:27 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 |
Le 08/09/2019 à 12:48, Laurent Vivier a écrit :
> 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>
> ---
> 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);
> }
>
>
Applied to my linux-user branch.
Thanks,
Laurent