[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/4] linux-user: introduce functions to detect CP
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH v2 2/4] linux-user: introduce functions to detect CPU type |
Date: |
Tue, 16 Jan 2018 18:25:08 +0100 |
From: YunQiang Su <address@hidden>
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 <address@hidden>
---
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);
--
2.14.3
- [Qemu-devel] [PATCH v2 0/4] linux-user: select CPU type according ELF header values, Laurent Vivier, 2018/01/16
- [Qemu-devel] [PATCH v2 3/4] linux-user, m68k: select CPU according to ELF header values, Laurent Vivier, 2018/01/16
- [Qemu-devel] [PATCH v2 4/4] linux-user: MIPS set cpu to r6 CPU if binary is R6, Laurent Vivier, 2018/01/16
- [Qemu-devel] [PATCH v2 2/4] linux-user: introduce functions to detect CPU type,
Laurent Vivier <=
- [Qemu-devel] [PATCH v2 1/4] linux-user: Move CPU type name selection to a function, Laurent Vivier, 2018/01/16
- Re: [Qemu-devel] [PATCH v2 0/4] linux-user: select CPU type according ELF header values, no-reply, 2018/01/17