Commit 3aabfec2 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/yongbok/tags/mips-20170728' into staging 



MIPS patches 2017-07-28

Changes:
* Improve ths MIPS board kernel load error reporting
* Revert unnecessary warning messages

# gpg: Signature made Fri 28 Jul 2017 13:47:52 BST
# gpg:                using RSA key 0x2238EB86D5F797C2
# gpg: Good signature from "Yongbok Kim <yongbok.kim@imgtec.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8600 4CF5 3415 A5D9 4CFA  2B5C 2238 EB86 D5F7 97C2

* remotes/yongbok/tags/mips-20170728:
  Revert "elf-loader: warn about invalid endianness"
  hw/mips: load_elf_strerror to report kernel loading failure

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 76297173 665df901

hw/core/loader.c

+0 −1
Original line number Diff line number Diff line
@@ -480,7 +480,6 @@ int load_elf_ram(const char *filename, 
    }



    if (target_data_order != e_ident[EI_DATA]) {

        fprintf(stderr, "%s: wrong endianness\n", filename);

        ret = ELF_LOAD_WRONG_ENDIAN;

        goto fail;

    }

hw/mips/mips_fulong2e.c

+9 −6
Original line number Diff line number Diff line
@@ -110,16 +110,19 @@ static int64_t load_kernel (CPUMIPSState *env) 
{

    int64_t kernel_entry, kernel_low, kernel_high;

    int index = 0;

    long initrd_size;

    long kernel_size, initrd_size;

    ram_addr_t initrd_offset;

    uint32_t *prom_buf;

    long prom_size;



    if (load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys, NULL,

                 (uint64_t *)&kernel_entry, (uint64_t *)&kernel_low,

                 (uint64_t *)&kernel_high, 0, EM_MIPS, 1, 0) < 0) {

        fprintf(stderr, "qemu: could not load kernel '%s'\n",

                loaderparams.kernel_filename);

    kernel_size = load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys,

                           NULL, (uint64_t *)&kernel_entry,

                           (uint64_t *)&kernel_low, (uint64_t *)&kernel_high,

                           0, EM_MIPS, 1, 0);

    if (kernel_size < 0) {

        error_report("qemu: could not load kernel '%s': %s",

                     loaderparams.kernel_filename,

                     load_elf_strerror(kernel_size));

        exit(1);

    }

hw/mips/mips_malta.c

+8 −6
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t* prom_buf, int index, 
static int64_t load_kernel (void)

{

    int64_t kernel_entry, kernel_high;

    long initrd_size;

    long kernel_size, initrd_size;

    ram_addr_t initrd_offset;

    int big_endian;

    uint32_t *prom_buf;
@@ -808,11 +808,13 @@ static int64_t load_kernel (void) 
    big_endian = 0;

#endif



    if (load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys, NULL,

                 (uint64_t *)&kernel_entry, NULL, (uint64_t *)&kernel_high,

                 big_endian, EM_MIPS, 1, 0) < 0) {

        fprintf(stderr, "qemu: could not load kernel '%s'\n",

                loaderparams.kernel_filename);

    kernel_size = load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys,

                           NULL, (uint64_t *)&kernel_entry, NULL,

                           (uint64_t *)&kernel_high, big_endian, EM_MIPS, 1, 0);

    if (kernel_size < 0) {

        error_report("qemu: could not load kernel '%s': %s",

                     loaderparams.kernel_filename,

                     load_elf_strerror(kernel_size));

        exit(1);

    }

hw/mips/mips_mipssim.c

+3 −2
Original line number Diff line number Diff line
@@ -78,8 +78,9 @@ static int64_t load_kernel(void) 
        if ((entry & ~0x7fffffffULL) == 0x80000000)

            entry = (int32_t)entry;

    } else {

        fprintf(stderr, "qemu: could not load kernel '%s'\n",

                loaderparams.kernel_filename);

        error_report("qemu: could not load kernel '%s': %s",

                     loaderparams.kernel_filename,

                     load_elf_strerror(kernel_size));

        exit(1);

    }

hw/mips/mips_r4k.c

+4 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "sysemu/block-backend.h"

#include "exec/address-spaces.h"

#include "sysemu/qtest.h"

#include "qemu/error-report.h"



#define MAX_IDE_BUS 2
@@ -96,8 +97,9 @@ static int64_t load_kernel(void) 
        if ((entry & ~0x7fffffffULL) == 0x80000000)

            entry = (int32_t)entry;

    } else {

        fprintf(stderr, "qemu: could not load kernel '%s'\n",

                loaderparams.kernel_filename);

        error_report("qemu: could not load kernel '%s': %s",

                     loaderparams.kernel_filename,

                     load_elf_strerror(kernel_size));

        exit(1);

    }