qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Crosthwaite <crosthwaitepeter@gmail.com>,
	qemu-ppc@nongnu.org, Alexander Graf <agraf@suse.de>,
	Peter Crosthwaite <crosthwaite.peter@gmail.com>
Subject: [Qemu-devel] [PULL 48/48] ppc: Rename ELF_MACHINE to be PPC specific
Date: Tue, 22 Sep 2015 17:06:11 +0200	[thread overview]
Message-ID: <1442934371-12567-49-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1442934371-12567-1-git-send-email-pbonzini@redhat.com>

From: Peter Crosthwaite <crosthwaitepeter@gmail.com>

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>
---
 hw/ppc/e500.c          | 2 +-
 hw/ppc/mac_newworld.c  | 4 ++--
 hw/ppc/mac_oldworld.c  | 4 ++--
 hw/ppc/ppc440_bamboo.c | 2 +-
 hw/ppc/prep.c          | 2 +-
 hw/ppc/spapr.c         | 4 ++--
 hw/ppc/virtex_ml507.c  | 2 +-
 linux-user/elfload.c   | 1 +
 target-ppc/cpu.h       | 4 ++--
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index e968386..b3418db 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -1017,7 +1017,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
     filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
 
     bios_size = load_elf(filename, NULL, NULL, &bios_entry, &loadaddr, NULL,
-                         1, ELF_MACHINE, 0);
+                         1, PPC_ELF_MACHINE, 0);
     if (bios_size < 0) {
         /*
          * Hrm. No ELF image? Try a uImage, maybe someone is giving us an
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index e1c5ed7..66d016c 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -219,7 +219,7 @@ static void ppc_core99_init(MachineState *machine)
     /* Load OpenBIOS (ELF) */
     if (filename) {
         bios_size = load_elf(filename, NULL, NULL, NULL,
-                             NULL, NULL, 1, ELF_MACHINE, 0);
+                             NULL, NULL, 1, PPC_ELF_MACHINE, 0);
 
         g_free(filename);
     } else {
@@ -242,7 +242,7 @@ static void ppc_core99_init(MachineState *machine)
         kernel_base = KERNEL_LOAD_ADDR;
 
         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)
             kernel_size = load_aout(kernel_filename, kernel_base,
                                     ram_size - kernel_base, bswap_needed,
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 5cba2cb..21eaf0e 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -147,7 +147,7 @@ static void ppc_heathrow_init(MachineState *machine)
     /* Load OpenBIOS (ELF) */
     if (filename) {
         bios_size = load_elf(filename, 0, NULL, NULL, NULL, NULL,
-                             1, ELF_MACHINE, 0);
+                             1, PPC_ELF_MACHINE, 0);
         g_free(filename);
     } else {
         bios_size = -1;
@@ -168,7 +168,7 @@ static void ppc_heathrow_init(MachineState *machine)
 #endif
         kernel_base = KERNEL_LOAD_ADDR;
         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)
             kernel_size = load_aout(kernel_filename, kernel_base,
                                     ram_size - kernel_base, bswap_needed,
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index ada676c..b66c113 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -256,7 +256,7 @@ static void bamboo_init(MachineState *machine)
                               NULL, NULL);
         if (success < 0) {
             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;
             loadaddr = elf_lowaddr;
         }
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 9d6d70a..d95222b 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -601,7 +601,7 @@ static void ppc_prep_init(MachineState *machine)
         bios_name = BIOS_FILENAME;
     }
     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);
     object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), NULL);
     qdev_init_nofail(dev);
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 05926a3..942d0dc 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1636,11 +1636,11 @@ static void ppc_spapr_init(MachineState *machine)
         uint64_t lowaddr = 0;
 
         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) {
             kernel_size = load_elf(kernel_filename,
                                    translate_kernel_address, NULL,
-                                   NULL, &lowaddr, NULL, 0, ELF_MACHINE, 0);
+                                   NULL, &lowaddr, NULL, 0, PPC_ELF_MACHINE, 0);
             kernel_le = kernel_size > 0;
         }
         if (kernel_size < 0) {
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 457d762..c2b5e44 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -257,7 +257,7 @@ static void virtex_init(MachineState *machine)
 
         /* Boots a kernel elf binary.  */
         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;
 
         if (kernel_size < 0) {
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 506b1ee..a7ff58c 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -678,6 +678,7 @@ static inline void init_thread(struct target_pt_regs *regs,
 
 #ifdef TARGET_PPC
 
+#define ELF_MACHINE    PPC_ELF_MACHINE
 #define ELF_START_MMAP 0x80000000
 
 #if defined(TARGET_PPC64) && !defined(TARGET_ABI32)
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 406d308..c6dbb38 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -81,9 +81,9 @@
 #include "fpu/softfloat.h"
 
 #if defined (TARGET_PPC64)
-#define ELF_MACHINE     EM_PPC64
+#define PPC_ELF_MACHINE     EM_PPC64
 #else
-#define ELF_MACHINE     EM_PPC
+#define PPC_ELF_MACHINE     EM_PPC
 #endif
 
 /*****************************************************************************/
-- 
2.5.0

  parent reply	other threads:[~2015-09-22 15:08 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-22 15:05 [Qemu-devel] [PULL 00/48] Misc patches for 2015-09-22 Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 01/48] nbd: convert to use the QAPI SocketAddress object Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 02/48] qemu-nbd: " Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 03/48] utils: rename strtosz to use qemu prefix Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 04/48] tests: add some qemu_strtosz() tests Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 05/48] checkpatch: do not recommend qemu_strtok over strtok Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 06/48] scsi-generic: let guests recognize readonly=on on passthrough devices Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 07/48] Makefile: fix build when VPATH is outside GIT tree Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 08/48] vhost-scsi: include linux/vhost.h Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 09/48] get_maintainer.pl: \C is deprecated Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 10/48] MAINTAINERS: there is no PPC64 TCG backend anymore Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 11/48] MAINTAINERS: Add disassemblers to the various backends Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 12/48] MAINTAINERS: Add more s390 files Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 13/48] MAINTAINERS: add IPack section Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 14/48] MAINTAINERS: add more devices to the PC section Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 15/48] MAINTAINERS: add more devices to the PCI section Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 16/48] MAINTAINERS: add maintainer for character device front-ends Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 17/48] ioapic: coalesce level interrupts Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 18/48] ioapic: fix contents of arbitration register Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 19/48] apic_internal.h: make some apic_get_* functions externally visible Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 20/48] apic_internal.h: rename ESR_ILLEGAL_ADDRESS to APIC_ESR_ILLEGAL_ADDRESS Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 21/48] apic_internal.h: added more constants Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 22/48] apic_internal.h: fix formatting and drop unused consts Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 23/48] monitor: make monitor_fprintf and mon_get_cpu externally visible Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 24/48] hmp: added local apic dump state Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 25/48] ioapic_internal.h: added more constants Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 26/48] hmp: added io apic dump state Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 27/48] hmp: implemented io apic dump state for TCG Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 28/48] linux_user: elfload: Default ELF_MACHINE to ELF_ARCH Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 29/48] linux-user: elfload: Provide default for elf_check_arch Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 30/48] elf_ops: Fix coding style for EM alias case statement Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 31/48] elf: Update EM_MOXIE definition Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 32/48] arm: Remove ELF_MACHINE from cpu.h Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 33/48] mb: " Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 34/48] m68k: " Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 35/48] cris: " Paolo Bonzini
2015-09-22 15:05 ` [Qemu-devel] [PULL 36/48] moxie: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 37/48] unicore: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 38/48] lm32: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 39/48] or32: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 40/48] tricore: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 41/48] xtensa: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 42/48] sh4: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 43/48] s390: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 44/48] sparc: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 45/48] mips: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 46/48] alpha: " Paolo Bonzini
2015-09-22 15:06 ` [Qemu-devel] [PULL 47/48] i386: Rename ELF_MACHINE to be x86 specific Paolo Bonzini
2015-09-22 15:06 ` Paolo Bonzini [this message]
2015-09-22 19:41 ` [Qemu-devel] [PULL 00/48] Misc patches for 2015-09-22 Peter Maydell
2015-09-22 20:12   ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442934371-12567-49-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=agraf@suse.de \
    --cc=crosthwaite.peter@gmail.com \
    --cc=crosthwaitepeter@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).