Commit 99a4434e authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Paolo Bonzini
Browse files

s390: Remove ELF_MACHINE from cpu.h 



The bootloader can just pass EM_S390 directly, as that
is architecture specific code.

This removes another architecture specific definition from the global
namespace.

Cc: Richard Henderson <rth@twiddle.net>
Cc: Alexander Graf <agraf@suse.de>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Acked-By: default avatarRiku Voipio <riku.voipio@linaro.org>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bf337d4e

hw/s390x/ipl.c

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int s390_ipl_init(SysBusDevice *dev) 


        bios_size = load_elf(bios_filename, bios_translate_addr, &fwbase,

                             &ipl->bios_start_addr, NULL, NULL, 1,

                             ELF_MACHINE, 0);

                             EM_S390, 0);

        if (bios_size > 0) {

            /* Adjust ELF start address to final location */

            ipl->bios_start_addr += fwbase;
@@ -154,7 +154,7 @@ static int s390_ipl_init(SysBusDevice *dev) 


    if (ipl->kernel) {

        kernel_size = load_elf(ipl->kernel, NULL, NULL, &pentry, NULL,

                               NULL, 1, ELF_MACHINE, 0);

                               NULL, 1, EM_S390, 0);

        if (kernel_size < 0) {

            kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);

        }

target-s390x/cpu.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


#define TARGET_LONG_BITS 64



#define ELF_MACHINE	EM_S390

#define ELF_MACHINE_UNAME "S390X"



#define CPUArchState struct CPUS390XState