[Qemu-commits] [qemu/qemu] 542ca4: linux-user: Move CPU type name selection to a func...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 542ca4349878a2ea3818aea5c448a6db567da3ae
      
https://github.com/qemu/qemu/commit/542ca4349878a2ea3818aea5c448a6db567da3ae
  Author: Laurent Vivier <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    A linux-user/aarch64/target_elf.h
    A linux-user/alpha/target_elf.h
    A linux-user/arm/target_elf.h
    A linux-user/cris/target_elf.h
    A linux-user/hppa/target_elf.h
    A linux-user/i386/target_elf.h
    A linux-user/m68k/target_elf.h
    M linux-user/main.c
    A linux-user/microblaze/target_elf.h
    A linux-user/mips/target_elf.h
    A linux-user/mips64/target_elf.h
    A linux-user/nios2/target_elf.h
    A linux-user/openrisc/target_elf.h
    A linux-user/ppc/target_elf.h
    A linux-user/s390x/target_elf.h
    A linux-user/sh4/target_elf.h
    A linux-user/sparc/target_elf.h
    A linux-user/sparc64/target_elf.h
    A linux-user/tilegx/target_elf.h
    A linux-user/unicore32/target_elf.h
    A linux-user/x86_64/target_elf.h

  Log Message:
  -----------
  linux-user: Move CPU type name selection to a function

Instead of a sequence of "#if ... #endif" move the
selection to a function in linux-user/*/target_elf.h

We can't add them in linux-user/*/target_cpu.h
because we will need to include "elf.h" to
use ELF flags with eflags, and including
"elf.h" in "target_cpu.h" introduces some
conflicts in elfload.c

Suggested-by: Richard Henderson <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>


  Commit: 768fe76e92477870ab14399dbc6bb8d801621c5c
      
https://github.com/qemu/qemu/commit/768fe76e92477870ab14399dbc6bb8d801621c5c
  Author: YunQiang Su <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M linux-user/elfload.c
    M linux-user/main.c
    M linux-user/qemu.h

  Log Message:
  -----------
  linux-user: introduce functions to detect CPU type

Add a function to return ELF e_flags and use it
to select the CPU model.

Signed-off-by: YunQiang Su <address@hidden>
[lv: split the patch and some cleanup in get_elf_eflags()]
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>


  Commit: 33dff5ff909c54c6545aa818419caf8802156d55
      
https://github.com/qemu/qemu/commit/33dff5ff909c54c6545aa818419caf8802156d55
  Author: Laurent Vivier <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M include/elf.h
    M linux-user/m68k/target_elf.h

  Log Message:
  -----------
  linux-user, m68k: select CPU according to ELF header values

M680x0 doesn't support the same set of instructions
as ColdFire, so we can't use "any" CPU type to execute
m68020 instructions.
We select CPU type ("m68040" or "any" for ColdFire)
according to the ELF header. If we can't, we
use by default the value used until now: "any".

Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>


  Commit: 45506bddba6fe73f61cf15fb682ffff73ce156c0
      
https://github.com/qemu/qemu/commit/45506bddba6fe73f61cf15fb682ffff73ce156c0
  Author: YunQiang Su <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M include/elf.h
    M linux-user/mips/target_elf.h
    M linux-user/mips64/target_elf.h

  Log Message:
  -----------
  linux-user: MIPS set cpu to r6 CPU if binary is R6

So here we need to detect the version of binaries and set
cpu_model for it.

Signed-off-by: YunQiang Su <address@hidden>
[lv: original patch modified to move code into cpu_get_model()]
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>


  Commit: 438cd7082c70b9e93a26ff4e2e83ac3f6a0027c2
      
https://github.com/qemu/qemu/commit/438cd7082c70b9e93a26ff4e2e83ac3f6a0027c2
  Author: Peter Maydell <address@hidden>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M include/elf.h
    A linux-user/aarch64/target_elf.h
    A linux-user/alpha/target_elf.h
    A linux-user/arm/target_elf.h
    A linux-user/cris/target_elf.h
    M linux-user/elfload.c
    A linux-user/hppa/target_elf.h
    A linux-user/i386/target_elf.h
    A linux-user/m68k/target_elf.h
    M linux-user/main.c
    A linux-user/microblaze/target_elf.h
    A linux-user/mips/target_elf.h
    A linux-user/mips64/target_elf.h
    A linux-user/nios2/target_elf.h
    A linux-user/openrisc/target_elf.h
    A linux-user/ppc/target_elf.h
    M linux-user/qemu.h
    A linux-user/s390x/target_elf.h
    A linux-user/sh4/target_elf.h
    A linux-user/sparc/target_elf.h
    A linux-user/sparc64/target_elf.h
    A linux-user/tilegx/target_elf.h
    A linux-user/unicore32/target_elf.h
    A linux-user/x86_64/target_elf.h

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/vivier2/tags/linux-user-for-2.12-pull-request' into staging

# gpg: Signature made Sun 25 Feb 2018 17:54:21 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <address@hidden>"
# gpg:                 aka "Laurent Vivier <address@hidden>"
# gpg:                 aka "Laurent Vivier (Red Hat) <address@hidden>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-2.12-pull-request:
  linux-user: MIPS set cpu to r6 CPU if binary is R6
  linux-user, m68k: select CPU according to ELF header values
  linux-user: introduce functions to detect CPU type
  linux-user: Move CPU type name selection to a function

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/0a773d55ac76...438cd7082c70