mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
Merge commit 'linux-user/linux-user-for-upstream' into tmp-staging
This commit is contained in:
commit
2152390dca
4 changed files with 116 additions and 92 deletions
|
@ -2432,6 +2432,7 @@ int main(int argc, char **argv, char **envp)
|
|||
envlist_t *envlist = NULL;
|
||||
const char *argv0 = NULL;
|
||||
int i;
|
||||
int ret;
|
||||
|
||||
if (argc <= 1)
|
||||
usage();
|
||||
|
@ -2636,9 +2637,10 @@ int main(int argc, char **argv, char **envp)
|
|||
env->opaque = ts;
|
||||
task_settid(ts);
|
||||
|
||||
if (loader_exec(filename, target_argv, target_environ, regs,
|
||||
info, &bprm) != 0) {
|
||||
printf("Error loading %s\n", filename);
|
||||
ret = loader_exec(filename, target_argv, target_environ, regs,
|
||||
info, &bprm);
|
||||
if (ret != 0) {
|
||||
printf("Error %d while loading %s\n", ret, filename);
|
||||
_exit(1);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue