[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 16/21] s390: Remove ELF_MACHINE from cpu.h
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PULL v1 16/21] s390: Remove ELF_MACHINE from cpu.h |
Date: |
Thu, 10 Sep 2015 22:44:38 -0700 |
From: Peter Crosthwaite <address@hidden>
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 <address@hidden>
Cc: Alexander Graf <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Acked-By: Riku Voipio <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
---
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 b650890..6ff0bae 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
- [Qemu-devel] [PULL v1 05/21] arm: Remove ELF_MACHINE from cpu.h, (continued)
- [Qemu-devel] [PULL v1 05/21] arm: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 04/21] elf: Update EM_MOXIE definition, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 06/21] mb: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 07/21] m68k: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 08/21] cris: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 09/21] moxie: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 10/21] unicore: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 12/21] or32: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 13/21] tricore: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 15/21] sh4: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 16/21] s390: Remove ELF_MACHINE from cpu.h,
Peter Crosthwaite <=
- [Qemu-devel] [PULL v1 14/21] xtensa: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 17/21] sparc: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 18/21] mips: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 19/21] alpha: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 20/21] i386: Rename ELF_MACHINE to be x86 specific, Peter Crosthwaite, 2015/09/11
- [Qemu-devel] [PULL v1 21/21] ppc: Rename ELF_MACHINE to be PPC specific, Peter Crosthwaite, 2015/09/11
- Re: [Qemu-devel] [PULL v1 00/21] Multi-arch queue, Peter Maydell, 2015/09/11