From nobody Tue Feb 10 05:41:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519581753599115.12082140210896; Sun, 25 Feb 2018 10:02:33 -0800 (PST) Received: from localhost ([::1]:55405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eq0d5-0003cg-Rp for importer@patchew.org; Sun, 25 Feb 2018 13:02:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eq0aS-0002Dy-DP for qemu-devel@nongnu.org; Sun, 25 Feb 2018 12:59:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eq0aO-0002lc-Gx for qemu-devel@nongnu.org; Sun, 25 Feb 2018 12:59:48 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:40195) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eq0aO-0002jP-3H for qemu-devel@nongnu.org; Sun, 25 Feb 2018 12:59:44 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LdVUQ-1eOtF82ZD0-00ioqP; Sun, 25 Feb 2018 18:59:32 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sun, 25 Feb 2018 18:59:26 +0100 Message-Id: <20180225175928.13101-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180225175928.13101-1-laurent@vivier.eu> References: <20180225175928.13101-1-laurent@vivier.eu> X-Provags-ID: V03:K0:hum1MFg+xJ1BuSucb8pQNsaj84QoBdAXMB0QH+5tb2d++Mt+I7l LHlg9Mh/Kdnfd9HW2Ht0cEqQRQgmQz5/DrzrFcYC8Hfve8g6gEaSx+Ui46x9aZZ7Wk7sHE0 8jL+hfR5ZTZ0f3so+/RA7qUjkFeujgokjRcHGLATr6zp+4pLhDFrdK1zQ2LMypCIMTIcqWF wZ8PRueWQsyQb4meDqqDA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ylU58OR1hPw=:q7IJ4Y3BMF8IKZScqs5N1F OUqPUPa1q/YT6WT2rFJ6hwh60P7/XIRL9Oz8Rhd5VyrScoXng/ZLN44oFO9r0H40E7sNSj7pB urobJzWvIFPE9QB/vvdMuSC9U4vRSq5RhbKLhL/dh3nTuepaWG+Grc+VdWPdKrTd5noQQQbbF 8gzAvB//9c20LTIZwuz9jz8J6TkIyvbt+Xfl/+PbNoaWbGWZPYcHronUvSI5DVjz6TGRAg7PG kuAm0dQjXeTHXzvyIVfWFk3HiYLrpxeYb5Pc7lnT6ozIcQ8ddy4QLqudSos2T4502Yav6csBA C4S35AcMTg77XbJh1qJTWz5FblB4CYHj9SDhK21t7zeOmywTdhyImDXUdSEHs7MjG7w+dAWBo aBDT8+bH7JyXbF+PXqQwar5D6J7IkXKFOd4HOxR7EFTK1Hly24oLAhB13A6uGsMZjem0aWdhy Xjh1GqwJFUMll0y1B3yklUcRTaMWbP8PiQ0VEiAPgnPZrKY7CoMvrl8EkENe3YoNpSFQMbfO7 7Ij1bEv/Y6w1sMIxl/BWJYQJnKQH0dDuc//wwyEMoLgSG2yck1H4QIoRUEAYM8MLjlf+uxa3k zu3pT77/RtxAsqpR/7U6eciRECQCS5eee9a7xnBiwpK1nKSPaFl99sWFBwyDIUMbIHDS4yX14 omHMJicxRIPq558Vt/29NlekBhjD2YDFCOCX6eHHANGrTz02ni7kFp9jpOQMlwDlXCIuJuhcT 6twbjXbbbk461fINnk4Pvh18DPRM6yOwX1Zstw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 2/4] linux-user: introduce functions to detect CPU type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: YunQiang Su , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: YunQiang Su Add a function to return ELF e_flags and use it to select the CPU model. Signed-off-by: YunQiang Su [lv: split the patch and some cleanup in get_elf_eflags()] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Message-Id: <20180220173307.25125-3-laurent@vivier.eu> --- linux-user/elfload.c | 35 +++++++++++++++++++++++++++++++++++ linux-user/main.c | 20 ++++++++++---------- linux-user/qemu.h | 1 + 3 files changed, 46 insertions(+), 10 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8bb9a2c3e8..0208022445 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2396,6 +2396,41 @@ give_up: g_free(syms); } =20 +uint32_t get_elf_eflags(int fd) +{ + struct elfhdr ehdr; + off_t offset; + int ret; + + /* Read ELF header */ + offset =3D lseek(fd, 0, SEEK_SET); + if (offset =3D=3D (off_t) -1) { + return 0; + } + ret =3D read(fd, &ehdr, sizeof(ehdr)); + if (ret < sizeof(ehdr)) { + return 0; + } + offset =3D lseek(fd, offset, SEEK_SET); + if (offset =3D=3D (off_t) -1) { + return 0; + } + + /* Check ELF signature */ + if (!elf_check_ident(&ehdr)) { + return 0; + } + + /* check header */ + bswap_ehdr(&ehdr); + if (!elf_check_ehdr(&ehdr)) { + return 0; + } + + /* return architecture id */ + return ehdr.e_flags; +} + int load_elf_binary(struct linux_binprm *bprm, struct image_info *info) { struct image_info interp_info; diff --git a/linux-user/main.c b/linux-user/main.c index 079b98235b..bbeb78fb89 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4344,8 +4344,17 @@ 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(filename, O_RDONLY); + if (execfd < 0) { + printf("Error while loading %s: %s\n", filename, strerror(errn= o)); + _exit(EXIT_FAILURE); + } + } + if (cpu_model =3D=3D NULL) { - cpu_model =3D cpu_get_model(0); + cpu_model =3D cpu_get_model(get_elf_eflags(execfd)); } tcg_exec_init(0); /* NOTE: we need to init the CPU at this stage to get @@ -4438,15 +4447,6 @@ int main(int argc, char **argv, char **envp) cpu->opaque =3D ts; task_settid(ts); =20 - execfd =3D qemu_getauxval(AT_EXECFD); - if (execfd =3D=3D 0) { - execfd =3D open(filename, O_RDONLY); - if (execfd < 0) { - printf("Error while loading %s: %s\n", filename, strerror(errn= o)); - _exit(EXIT_FAILURE); - } - } - ret =3D loader_exec(execfd, filename, target_argv, target_environ, reg= s, info, &bprm); if (ret !=3D 0) { diff --git a/linux-user/qemu.h b/linux-user/qemu.h index bc4bf35036..f4b4ca72ad 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -186,6 +186,7 @@ int loader_exec(int fdexec, const char *filename, char = **argv, char **envp, struct target_pt_regs * regs, struct image_info *infop, struct linux_binprm *); =20 +uint32_t get_elf_eflags(int fd); int load_elf_binary(struct linux_binprm *bprm, struct image_info *info); int load_flt_binary(struct linux_binprm *bprm, struct image_info *info); =20 --=20 2.14.3