From patchwork Tue Jan 16 22:22:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 861919 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 3zLl9K0DxSz9sCZ for ; Wed, 17 Jan 2018 09:23:16 +1100 (AEDT) Received: from localhost ([::1]:41293 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebZdR-0004q4-IT for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 17:23:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebZcr-0004p8-4c for qemu-devel@nongnu.org; Tue, 16 Jan 2018 17:22:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebZco-0003NQ-6f for qemu-devel@nongnu.org; Tue, 16 Jan 2018 17:22:37 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:56811) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebZcn-0003Mk-Qw for qemu-devel@nongnu.org; Tue, 16 Jan 2018 17:22:34 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MWvfk-1eN9uI37pM-00VvY5; Tue, 16 Jan 2018 23:22:18 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 16 Jan 2018 23:22:10 +0100 Message-Id: <20180116222212.1266-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180116222212.1266-1-laurent@vivier.eu> References: <20180116222212.1266-1-laurent@vivier.eu> X-Provags-ID: V03:K0:lZz5882cz5KBWlk/uQ5eiQnhV+xGBL5QgwvslVj40KWmeM6n2eX BjasvrZpWuhYNEUSbngcYGv0k6GeIVpYxZt5jIU7WcAHocNV1OIRdVph4H9TrRMAzGjytRR 0wFZhMBSBN89U75YkMkRjqgPBMK+YEDQKZFU9Q3Y8E5BlnA45waOBPGUfVlanW6IuuNhYMb dszns/GjA4S0PufOtjrhw== X-UI-Out-Filterresults: notjunk:1; V01:K0:u+/2DBn+FY0=:KUh4s6Jq9Vj9YozpdcVASh 99Uunc6aK0u0Pj4pRKtvGJVl/115WMHRZ3qAAwHC58kd5ceBamMDSedGhRaiEz6gDSGIXqrIW 0dK1QplZeSrp9AFCB1Yu/3TlSgksh26ZAVfrlKZNCkfnVZm9iAbowefEpPOyzJzoVjQnyu5/i EPI4WcdSlOPuF6MQcJfvCBIQFNKldO0M1QAI8z/21ZZ7tjXxi2svVbVmYuKTv7nO10ESjLdGd /C8uObecnC2Ta2RTabVxde/eKJAhajcvt3PC1qZDNTmG2lkO1iLzIZSpkZgLheN6r4XNiIWe2 5wbt4PJxHI0w7ykH2bM6f2h0nsb/9QXDAvbLgVya43d6R9B/teTZvDcqG1R0+RopVQrEiG836 5H7O9DZQ2IImocJCjV+EUAf/DDom3LaR3dyk59K3araosDvuKxIHUw0hqxazTHgYFXPm/IdhD GUikqx+FFgPfxwVElpn4cCw+984oJwun/liLiPTmJIWr+xrJSrA6M0Fd/lvJJZvSnP6MX+6Om czZwHzSxhK3V5YZy0mSC2eFm4cmSPaoIhXcLT81skO5bUizOTgs2g2FTxw5TuSKyqq0T/44Iu XTv/PlGYt3uHK3fTyqEa43lZLy7GcZsX3bl8I1eZJsE6rnGZJWe3q9FYMyNH9w0Vj6PTZCP7K SqSklncZsaixnbRry2k2Cc/eY9+AZJ3O3lcziJy9Bl0WjrbLeNPbQJ5GORUDyb+qnEmZ7So1I 7KZDLGU7qvBGtnzL5UK7OPZTCP7PLGk9q1myeA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v3 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 , 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. [lv: split the patch and some cleanup in get_elf_eflags()] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- Notes: YunQiang Su, please add your Signed-off-by that was missing in your original patch. v2: call cpu_get_model() with the result of get_elf_eflags() 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);