From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksr-0006vj-Kz for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZQksp-0000g0-Ir for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:05 -0400 Received: from mail-pd0-x230.google.com ([2607:f8b0:400e:c02::230]:33556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksp-0000fu-C4 for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:03 -0400 Received: by pdrh1 with SMTP id h1so42863699pdr.0 for ; Sat, 15 Aug 2015 16:29:02 -0700 (PDT) From: Peter Crosthwaite Date: Sat, 15 Aug 2015 16:28:24 -0700 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 14/19] s390: Remove ELF_MACHINE from cpu.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , riku.voipio@iki.fi, Alexander Graf , Peter Crosthwaite , pbonzini@redhat.com, Richard Henderson From: Peter Crosthwaite 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 Cc: Alexander Graf Signed-off-by: Peter Crosthwaite --- hw/s390x/ipl.c | 4 ++-- target-s390x/cpu.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 2e0a8b6..31473e7 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -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); } diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 63aebf4..3b4d4e5 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -27,7 +27,6 @@ #define TARGET_LONG_BITS 64 -#define ELF_MACHINE EM_S390 #define ELF_MACHINE_UNAME "S390X" #define CPUArchState struct CPUS390XState -- 1.9.1