Commit 4ecd4d16 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Paolo Bonzini
Browse files

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: default avatarRichard Henderson <rth@twiddle.net>
Acked-By: default avatarRiku Voipio <riku.voipio@linaro.org>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a5e8788f

hw/ppc/e500.c

+1 −1
Original line number Diff line number Diff line
@@ -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

hw/ppc/mac_newworld.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

hw/ppc/mac_oldworld.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

hw/ppc/ppc440_bamboo.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

hw/ppc/prep.c

+1 −1
Original line number Diff line number Diff line
@@ -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);