From patchwork Wed Jan 24 21:12:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 865483 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zRdJt2Mvgz9ryv for ; Thu, 25 Jan 2018 08:16:46 +1100 (AEDT) Received: from localhost ([::1]:46734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeSPU-0001UE-FO for incoming@patchwork.ozlabs.org; Wed, 24 Jan 2018 16:16:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeSMO-0007kA-2N for qemu-devel@nongnu.org; Wed, 24 Jan 2018 16:13:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeSMJ-0006TZ-3e for qemu-devel@nongnu.org; Wed, 24 Jan 2018 16:13:32 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:51758) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eeSMI-0006Sx-QE for qemu-devel@nongnu.org; Wed, 24 Jan 2018 16:13:27 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MT82Y-1eFb8M0USc-00S5bf; Wed, 24 Jan 2018 22:13:08 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 24 Jan 2018 22:12:59 +0100 Message-Id: <20180124211301.10095-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180124211301.10095-1-laurent@vivier.eu> References: <20180124211301.10095-1-laurent@vivier.eu> X-Provags-ID: V03:K0:8Nm42/X18t0AXnox5BU/EezUinZRhANvgsvOIi2Ebes5R/sDvlq teFrJElEHKFswU+JrNY4IJyOMb8UdebfM2SmRYpwHjoxtCQH+dO7XQAYFVz5MTxeFR82GOJ /ewt5cxa2mozHsxMfVkZO3Hz1lUSjIUzF6ThSiCvUQ/8ISFx4Uitl+9XX7UkMdOc7wkyHYw 89C11xAujGwhDVXJw2zGQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:VkUO6sdzyOw=:Oo7YWK77Rn+MFg6QkDpR7d YkEkOmTnVm3tmUgceSHyylrC+8tTRQmyUuzU74xW3d9AGARR1yo377YVPbr1Pc2r26sm1CJhP JGl/EN53qtxPSXF+wULx8DQAH2WxJbuQex6bGV5CBUS9pAzBcetum24KVo7Aa8L7Oll3gKqnG e46EZ1Zs4QrMfXjWmz+QKgubBgVymG9qKbTyvDANEUeOTw7EZzIbH+1a3tSPce9I1ofWVzWeL 4jII26AkeYDsCFf9lLpl1lYvyX5+x6fi87HRS/rsWCuj3q5xWI7g82Z9qoj6KaKtZVlkFvChh /+P3reUht4RIW36+r45yKpxxiBe57JJOGxvcvqEFMK2nN88kJ0Z2Lt8SS9oi6zDZ2+V50Dbyq 0fXq0dXZpI2/psyi/mlr1xoiICzRKPQ/0oBP5FgmqdAZidR1SmNZZxZYyLC4BFUJmtnKYUubA lxDqcg1tMH1nhdToPyq/+cXA2Rcpj51irK9DmDHKFK32NKmBp6uPsBgaAjtyq7I/5kpip9x+p 5nk+il7JByNdf6hTV1vZ6VOlwLbvmAsS2zixpa8dPUQp6/GnZ8iSBIdrhusGeFK9cHmSnQ7bV ANQ5E0xI5JH7e2bhqX3p5sCTMVXgW7/e81u7Yb+5wcZOUi1ppPOoUAQNimaGbNsFNOGivvm2L be9nMBGLAl+WMylHh6u3RvmrHJbB5698VZ034nqWVVUx3HY2oLFkCHCBaUCgF4+NqZR9ul6Ky oK05nvELP3Er6zl1X7gvrnt+6As650JhINyVBw== 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] [PATCH v4 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: Peter Maydell , YunQiang Su , Riku Voipio , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , Igor Mammedov , Aaron Sierra Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 20f3d8c2c3..67e2425ac6 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2376,6 +2376,41 @@ give_up: g_free(syms); } +uint32_t get_elf_eflags(int fd) +{ + struct elfhdr ehdr; + off_t offset; + int ret; + + /* Read ELF header */ + offset = lseek(fd, 0, SEEK_SET); + if (offset == (off_t) -1) { + return 0; + } + ret = read(fd, &ehdr, sizeof(ehdr)); + if (ret < sizeof(ehdr)) { + return 0; + } + offset = lseek(fd, offset, SEEK_SET); + if (offset == (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 3954e8996b..6845b56030 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4319,8 +4319,17 @@ int main(int argc, char **argv, char **envp) init_qemu_uname_release(); + execfd = qemu_getauxval(AT_EXECFD); + if (execfd == 0) { + execfd = open(filename, O_RDONLY); + if (execfd < 0) { + printf("Error while loading %s: %s\n", filename, strerror(errno)); + _exit(EXIT_FAILURE); + } + } + if (cpu_model == NULL) { - cpu_model = cpu_get_model(0); + cpu_model = cpu_get_model(get_elf_eflags(execfd)); } tcg_exec_init(0); /* NOTE: we need to init the CPU at this stage to get @@ -4413,15 +4422,6 @@ int main(int argc, char **argv, char **envp) cpu->opaque = ts; task_settid(ts); - execfd = qemu_getauxval(AT_EXECFD); - if (execfd == 0) { - execfd = open(filename, O_RDONLY); - if (execfd < 0) { - printf("Error while loading %s: %s\n", filename, strerror(errno)); - _exit(EXIT_FAILURE); - } - } - ret = loader_exec(execfd, filename, target_argv, target_environ, regs, info, &bprm); if (ret != 0) { diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 4edd7d0c08..47ca71159c 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -188,6 +188,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 *); +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);