From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZePAn-00038u-8O for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:08:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZePAk-0001NH-FH for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:08:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZePAk-0001N9-9n for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:58 -0400 From: Paolo Bonzini Date: Tue, 22 Sep 2015 17:06:06 +0200 Message-Id: <1442934371-12567-44-git-send-email-pbonzini@redhat.com> In-Reply-To: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> References: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 43/48] 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 , Peter Crosthwaite , Alexander Graf , 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 Reviewed-by: Richard Henderson Acked-By: Riku Voipio Signed-off-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- 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 9aeb024..5acd54c 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 -- 2.5.0