motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-17 15:12:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ppc: Rename ELF_MACHINE to be PPC specific

Browse source 
Rename ELF_MACHINE to be PPC specific. This is used as-is by the
various PPC bootloaders and is locally defined to ELF_MACHINE in linux
user in PPC specific ifdeffery.

This removes another architecture specific definition from the global
namespace (as desired by multi-arch).

Cc: Alexander Graf <agraf@suse.de>
Cc: qemu-ppc@nongnu.org
Reviewed-by: Richard Henderson <rth@twiddle.net>
Acked-By: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Crosthwaite 2015-05-10 23:29:10 -07:00 • committed by Paolo Bonzini
parent a5e8788f89
commit 4ecd4d16a0
9 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/ppc/e500.c
View file

@ -1017,7 +1017,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
bios_size = load_elf(filename, NULL, NULL, &bios_entry, &loadaddr, NULL, bios_size = load_elf(filename, NULL, NULL, &bios_entry, &loadaddr, NULL,
1, ELF_MACHINE, 0); 1, PPC_ELF_MACHINE, 0);
if (bios_size < 0) { if (bios_size < 0) {
/* /*
* Hrm. No ELF image? Try a uImage, maybe someone is giving us an * Hrm. No ELF image? Try a uImage, maybe someone is giving us an

4
hw/ppc/mac_newworld.c
View file

@ -219,7 +219,7 @@ static void ppc_core99_init(MachineState *machine)
/* Load OpenBIOS (ELF) */ /* Load OpenBIOS (ELF) */
if (filename) { if (filename) {
bios_size = load_elf(filename, NULL, NULL, NULL, bios_size = load_elf(filename, NULL, NULL, NULL,
NULL, NULL, 1, ELF_MACHINE, 0); NULL, NULL, 1, PPC_ELF_MACHINE, 0);
g_free(filename); g_free(filename);
} else { } else {
@ -242,7 +242,7 @@ static void ppc_core99_init(MachineState *machine)
kernel_base = KERNEL_LOAD_ADDR; kernel_base = KERNEL_LOAD_ADDR;
kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL, kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL,
NULL, &lowaddr, NULL, 1, ELF_MACHINE, 0); NULL, &lowaddr, NULL, 1, PPC_ELF_MACHINE, 0);
if (kernel_size < 0) if (kernel_size < 0)
kernel_size = load_aout(kernel_filename, kernel_base, kernel_size = load_aout(kernel_filename, kernel_base,
ram_size - kernel_base, bswap_needed, ram_size - kernel_base, bswap_needed,

4
hw/ppc/mac_oldworld.c
View file

@ -147,7 +147,7 @@ static void ppc_heathrow_init(MachineState *machine)
/* Load OpenBIOS (ELF) */ /* Load OpenBIOS (ELF) */
if (filename) { if (filename) {
bios_size = load_elf(filename, 0, NULL, NULL, NULL, NULL, bios_size = load_elf(filename, 0, NULL, NULL, NULL, NULL,
1, ELF_MACHINE, 0); 1, PPC_ELF_MACHINE, 0);
g_free(filename); g_free(filename);
} else { } else {
bios_size = -1; bios_size = -1;
@ -168,7 +168,7 @@ static void ppc_heathrow_init(MachineState *machine)
#endif #endif
kernel_base = KERNEL_LOAD_ADDR; kernel_base = KERNEL_LOAD_ADDR;
kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL, kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL,
NULL, &lowaddr, NULL, 1, ELF_MACHINE, 0); NULL, &lowaddr, NULL, 1, PPC_ELF_MACHINE, 0);
if (kernel_size < 0) if (kernel_size < 0)
kernel_size = load_aout(kernel_filename, kernel_base, kernel_size = load_aout(kernel_filename, kernel_base,
ram_size - kernel_base, bswap_needed, ram_size - kernel_base, bswap_needed,

2
hw/ppc/ppc440_bamboo.c
View file

@ -256,7 +256,7 @@ static void bamboo_init(MachineState *machine)
NULL, NULL); NULL, NULL);
if (success < 0) { if (success < 0) {
success = load_elf(kernel_filename, NULL, NULL, &elf_entry, success = load_elf(kernel_filename, NULL, NULL, &elf_entry,
&elf_lowaddr, NULL, 1, ELF_MACHINE, 0); &elf_lowaddr, NULL, 1, PPC_ELF_MACHINE, 0);
entry = elf_entry; entry = elf_entry;
loadaddr = elf_lowaddr; loadaddr = elf_lowaddr;
} }

2
hw/ppc/prep.c
View file

@ -601,7 +601,7 @@ static void ppc_prep_init(MachineState *machine)
bios_name = BIOS_FILENAME; bios_name = BIOS_FILENAME;
} }
qdev_prop_set_string(dev, "bios-name", bios_name); qdev_prop_set_string(dev, "bios-name", bios_name);
qdev_prop_set_uint32(dev, "elf-machine", ELF_MACHINE); qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);
pcihost = PCI_HOST_BRIDGE(dev); pcihost = PCI_HOST_BRIDGE(dev);
object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), NULL); object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), NULL);
qdev_init_nofail(dev); qdev_init_nofail(dev);

4
hw/ppc/spapr.c
View file

@ -1860,11 +1860,11 @@ static void ppc_spapr_init(MachineState *machine)
uint64_t lowaddr = 0; uint64_t lowaddr = 0;
kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL, kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL,
NULL, &lowaddr, NULL, 1, ELF_MACHINE, 0); NULL, &lowaddr, NULL, 1, PPC_ELF_MACHINE, 0);
if (kernel_size == ELF_LOAD_WRONG_ENDIAN) { if (kernel_size == ELF_LOAD_WRONG_ENDIAN) {
kernel_size = load_elf(kernel_filename, kernel_size = load_elf(kernel_filename,
translate_kernel_address, NULL, translate_kernel_address, NULL,
NULL, &lowaddr, NULL, 0, ELF_MACHINE, 0); NULL, &lowaddr, NULL, 0, PPC_ELF_MACHINE, 0);
kernel_le = kernel_size > 0; kernel_le = kernel_size > 0;
} }
if (kernel_size < 0) { if (kernel_size < 0) {

2
hw/ppc/virtex_ml507.c
View file

@ -257,7 +257,7 @@ static void virtex_init(MachineState *machine)
/* Boots a kernel elf binary. */ /* Boots a kernel elf binary. */
kernel_size = load_elf(kernel_filename, NULL, NULL, kernel_size = load_elf(kernel_filename, NULL, NULL,
&entry, &low, &high, 1, ELF_MACHINE, 0); &entry, &low, &high, 1, PPC_ELF_MACHINE, 0);
boot_info.bootstrap_pc = entry & 0x00ffffff; boot_info.bootstrap_pc = entry & 0x00ffffff;
if (kernel_size < 0) { if (kernel_size < 0) {

1
linux-user/elfload.c
View file

@ -678,6 +678,7 @@ static inline void init_thread(struct target_pt_regs *regs,
#ifdef TARGET_PPC #ifdef TARGET_PPC
#define ELF_MACHINE PPC_ELF_MACHINE
#define ELF_START_MMAP 0x80000000 #define ELF_START_MMAP 0x80000000
#if defined(TARGET_PPC64) && !defined(TARGET_ABI32) #if defined(TARGET_PPC64) && !defined(TARGET_ABI32)

4
target-ppc/cpu.h
View file

@ -81,9 +81,9 @@
#include "fpu/softfloat.h" #include "fpu/softfloat.h"
#if defined (TARGET_PPC64) #if defined (TARGET_PPC64)
#define ELF_MACHINE EM_PPC64 #define PPC_ELF_MACHINE EM_PPC64
#else #else
#define ELF_MACHINE EM_PPC #define PPC_ELF_MACHINE EM_PPC
#endif #endif
/*****************************************************************************/ /*****************************************************************************/