aboutsummaryrefslogtreecommitdiff
path: root/hw/mips/mips_fulong2e.c
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2017-07-27 01:56:13 +0200
committerYongbok Kim <yongbok.kim@imgtec.com>2017-07-28 13:32:32 +0100
commit3ee3122c0d2614297890ded2017655fc2a139af6 (patch)
tree95b1a1d320680952eed547fce98463543a2ac619 /hw/mips/mips_fulong2e.c
parent871a0f7ad2b9560c5f7d640125c5be95ca23ca7f (diff)
hw/mips: load_elf_strerror to report kernel loading failure
Emulated MIPS boards bail out with a simple "could not load kernel" when a kernel could not be load, without specifying the underlying reason. Fix that by calling load_elf_strerror. At the same time use error_report to report the error instead of fprintf. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
Diffstat (limited to 'hw/mips/mips_fulong2e.c')
-rw-r--r--hw/mips/mips_fulong2e.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 3f3cb32651..3532399a13 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -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);
}