[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] linux-user: make binfmt flag O require P
From: |
Joakim Tjernlund |
Subject: |
[PATCH] linux-user: make binfmt flag O require P |
Date: |
Sat, 14 Dec 2019 13:20:22 +0100 |
From: Joakim Tjernlund <address@hidden>
QEMU can autodetect if it is started from Linux binfmt loader
when binfmt flag O is on.
Use that and require binfmt flag P as well which will enable QEMU
to pass in correct argv0 to the application.
Signed-off-by: Joakim Tjernlund <address@hidden>
---
linux-user/main.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index 6ff7851e86..1b626e5762 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -544,7 +544,7 @@ static void usage(int exitcode)
exit(exitcode);
}
-static int parse_args(int argc, char **argv)
+static int parse_args(int argc, char **argv, int assume_P_flag)
{
const char *r;
int optind;
@@ -560,7 +560,17 @@ static int parse_args(int argc, char **argv)
arginfo->handle_opt(r);
}
}
-
+ if (assume_P_flag) {
+ /* Assume started by binmisc and binfmt P flag is set */
+ if (argc < 3) {
+ fprintf(stderr, "%s: Please use me through binfmt with P flag\n",
+ argv[0]);
+ exit(1);
+ }
+ exec_path = argv[1];
+ /* Next argv must be argv0 for the app */
+ return 2;
+ }
optind = 1;
for (;;) {
if (optind >= argc) {
@@ -659,7 +669,8 @@ int main(int argc, char **argv, char **envp)
qemu_add_opts(&qemu_trace_opts);
qemu_plugin_add_opts();
- optind = parse_args(argc, argv);
+ execfd = qemu_getauxval(AT_EXECFD);
+ optind = parse_args(argc, argv, execfd > 0);
if (!trace_init_backends()) {
exit(1);
@@ -682,7 +693,6 @@ int main(int argc, char **argv, char **envp)
init_qemu_uname_release();
- execfd = qemu_getauxval(AT_EXECFD);
if (execfd == 0) {
execfd = open(exec_path, O_RDONLY);
if (execfd < 0) {
--
2.24.1
- [PATCH] linux-user: make binfmt flag O require P,
Joakim Tjernlund <=