diff options
| author | Peter Crosthwaite <crosthwaitepeter@gmail.com> | 2015-05-10 23:29:10 -0700 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-09-25 12:04:44 +0200 |
| commit | 4ecd4d16a0af714ff7d9a1ad2559c621bf27649f (patch) | |
| tree | cb58fe387998d2cf17547307a720d07b012e28a2 /hw/ppc/prep.c | |
| parent | a5e8788f89312f19f54dba0454ee5bf7209b4cd7 (diff) | |
| download | focaccia-qemu-4ecd4d16a0af714ff7d9a1ad2559c621bf27649f.tar.gz focaccia-qemu-4ecd4d16a0af714ff7d9a1ad2559c621bf27649f.zip | |
ppc: Rename ELF_MACHINE to be PPC specific
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>
Diffstat (limited to 'hw/ppc/prep.c')
| -rw-r--r-- | hw/ppc/prep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 9d6d70a16c..d95222bd7d 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); |