On 03/09/2018 05:12 AM, Michael Clark wrote:
> Pointless indirection. Other ports use EM_ constants directly.
>
> Cc: Sagar Karandikar <sag...@eecs.berkeley.edu>
> Cc: Bastian Koppelmann <kbast...@mail.uni-paderborn.de>
> Signed-off-by: Michael Clark <m...@sifive.com>
> Signed-off-by: Palmer Dabbelt <pal...@sifive.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> hw/riscv/sifive_e.c | 2 +-
> hw/riscv/sifive_u.c | 2 +-
> hw/riscv/spike.c | 2 +-
> hw/riscv/virt.c | 2 +-
> target/riscv/cpu.h | 1 -
> 5 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
> index 4872b68..39e4cb4 100644
> --- a/hw/riscv/sifive_e.c
> +++ b/hw/riscv/sifive_e.c
> @@ -88,7 +88,7 @@ static uint64_t load_kernel(const char *kernel_filename)
>
> if (load_elf(kernel_filename, NULL, NULL,
> &kernel_entry, NULL, &kernel_high,
> - 0, ELF_MACHINE, 1, 0) < 0) {
> + 0, EM_RISCV, 1, 0) < 0) {
> error_report("qemu: could not load kernel '%s'", kernel_filename);
> exit(1);
> }
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 57b4f4f..0e633a0 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -74,7 +74,7 @@ static uint64_t load_kernel(const char *kernel_filename)
>
> if (load_elf(kernel_filename, NULL, NULL,
> &kernel_entry, NULL, &kernel_high,
> - 0, ELF_MACHINE, 1, 0) < 0) {
> + 0, EM_RISCV, 1, 0) < 0) {
> error_report("qemu: could not load kernel '%s'", kernel_filename);
> exit(1);
> }
> diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
> index c7d937b..70e697c 100644
> --- a/hw/riscv/spike.c
> +++ b/hw/riscv/spike.c
> @@ -64,7 +64,7 @@ static uint64_t load_kernel(const char *kernel_filename)
> uint64_t kernel_entry, kernel_high;
>
> if (load_elf_ram_sym(kernel_filename, NULL, NULL,
> - &kernel_entry, NULL, &kernel_high, 0, ELF_MACHINE, 1, 0,
> + &kernel_entry, NULL, &kernel_high, 0, EM_RISCV, 1, 0,
> NULL, true, htif_symbol_callback) < 0) {
> error_report("qemu: could not load kernel '%s'", kernel_filename);
> exit(1);
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index d680cbd..e3f8bb7 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -68,7 +68,7 @@ static uint64_t load_kernel(const char *kernel_filename)
>
> if (load_elf(kernel_filename, NULL, NULL,
> &kernel_entry, NULL, &kernel_high,
> - 0, ELF_MACHINE, 1, 0) < 0) {
> + 0, EM_RISCV, 1, 0) < 0) {
> error_report("qemu: could not load kernel '%s'", kernel_filename);
> exit(1);
> }
> diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
> index 3a0ca2f..7c4482b 100644
> --- a/target/riscv/cpu.h
> +++ b/target/riscv/cpu.h
> @@ -34,7 +34,6 @@
>
> #define TCG_GUEST_DEFAULT_MO 0
>
> -#define ELF_MACHINE EM_RISCV
> #define CPUArchState struct CPURISCVState
>
> #include "qemu-common.h"
>
