haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

linux-user: Use qemu_getauxval for AT_EXECFD

Browse source 
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2013-10-15 15:00:36 -07:00
parent 664d2c4458
commit 0b959cf5e4
1 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
linux-user/main.c
View file

@ -3663,26 +3663,6 @@ static int parse_args(int argc, char **argv)
return optind; return optind;
} }
static int get_execfd(char **envp)
{
typedef struct {
long a_type;
long a_val;
} auxv_t;
auxv_t *auxv;
while (*envp++ != NULL) {
;
}
for (auxv = (auxv_t *)envp; auxv->a_type != AT_NULL; auxv++) {
if (auxv->a_type == AT_EXECFD) {
return auxv->a_val;
}
}
return -1;
}
int main(int argc, char **argv, char **envp) int main(int argc, char **argv, char **envp)
{ {
struct target_pt_regs regs1, *regs = &regs1; struct target_pt_regs regs1, *regs = &regs1;
@ -3876,13 +3856,13 @@ int main(int argc, char **argv, char **envp)
env->opaque = ts; env->opaque = ts;
task_settid(ts); task_settid(ts);
execfd = get_execfd(envp); execfd = qemu_getauxval(AT_EXECFD);
if (execfd < 0) { if (execfd == 0) {
execfd = open(filename, O_RDONLY); execfd = open(filename, O_RDONLY);
} if (execfd < 0) {
if (execfd < 0) { printf("Error while loading %s: %s\n", filename, strerror(errno));
printf("Error while loading %s: %s\n", filename, strerror(-execfd)); _exit(1);
_exit(1); }
} }
ret = loader_exec(execfd, filename, target_argv, target_environ, regs, ret = loader_exec(execfd, filename, target_argv, target_environ, regs,