From nobody Tue May 14 13:26:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=infinera.com ARC-Seal: i=1; a=rsa-sha256; t=1576363712; cv=none; d=zohomail.com; s=zohoarc; b=NcsQrdEG7/HRyw5xm+DvnVrlu17kxe+LHMIEWOGulRxtkvgbw4GgLynidoXqNg5XbAZv9S9edmMbJEmkM6vqgOu1ocQPqlm8cjeV1PJjKXXjVj6lHOhswogzT/X+7xPkbnX6SjvqNxIxGn8SM+lsttl2JV0ReASUXEsH3vV3ZpY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576363712; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=f0zwUcrHWg/fccUNZEuJVff92D8mdfBFyqmr0py2ZNI=; b=L5EKGsrDAe1qrcNudbciuherHzKky3aTMlEC6tOnGLMdtgvmHarjKPIfQmmH2leAykMH/DS68xHAhsB1NwEKfL5B9fmmJ4YL/YYC9RGxgF+kEOeU+JRiwsO3UZuxZXcgSa/MO1FMNE6Wz46HD6LMukd4+ueJnqKqPwLiSl/9NpE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576363711785704.6039745153936; Sat, 14 Dec 2019 14:48:31 -0800 (PST) Received: from localhost ([::1]:34200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igGD8-0002yF-3Q for importer@patchew.org; Sat, 14 Dec 2019 17:48:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41543) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igFGk-0002PV-L2 for qemu-devel@nongnu.org; Sat, 14 Dec 2019 16:48:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igFGj-0008Dj-2Y for qemu-devel@nongnu.org; Sat, 14 Dec 2019 16:48:10 -0500 Received: from [31.15.61.139] (port=53679 helo=smtp.transmode.se) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1igFGi-0007rc-Qy for qemu-devel@nongnu.org; Sat, 14 Dec 2019 16:48:08 -0500 Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [10.210.71.11]) by smtp.transmode.se (Postfix) with ESMTP id 35153118C7C6; Sat, 14 Dec 2019 13:20:25 +0100 (CET) Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [127.0.0.1]) by gentoo-jocke.infinera.com (8.15.2/8.14.9) with ESMTP id xBECKO5P017611; Sat, 14 Dec 2019 13:20:25 +0100 Received: (from jocke@localhost) by gentoo-jocke.infinera.com (8.15.2/8.15.2/Submit) id xBECKO39017610; Sat, 14 Dec 2019 13:20:24 +0100 From: Joakim Tjernlund To: qemu-devel@nongnu.org Subject: [PATCH] linux-user: make binfmt flag O require P Date: Sat, 14 Dec 2019 13:20:22 +0100 Message-Id: <20191214122022.17255-1-joakim.tjernlund@infinera.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 31.15.61.139 X-Mailman-Approved-At: Sat, 14 Dec 2019 17:47:43 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joakim Tjernlund Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Joakim Tjernlund 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 --- 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); } =20 -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 =3D argv[1]; + /* Next argv must be argv0 for the app */ + return 2; + } optind =3D 1; for (;;) { if (optind >=3D argc) { @@ -659,7 +669,8 @@ int main(int argc, char **argv, char **envp) qemu_add_opts(&qemu_trace_opts); qemu_plugin_add_opts(); =20 - optind =3D parse_args(argc, argv); + execfd =3D qemu_getauxval(AT_EXECFD); + optind =3D parse_args(argc, argv, execfd > 0); =20 if (!trace_init_backends()) { exit(1); @@ -682,7 +693,6 @@ int main(int argc, char **argv, char **envp) =20 init_qemu_uname_release(); =20 - execfd =3D qemu_getauxval(AT_EXECFD); if (execfd =3D=3D 0) { execfd =3D open(exec_path, O_RDONLY); if (execfd < 0) { --=20 2.24.1