ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Aurelien Jarno 2017-07-27 01:56:13 +02:00 committed by Yongbok Kim
parent 871a0f7ad2
commit 3ee3122c0d
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/mips/mips_fulong2e.c
View File

@ -110,16 +110,19 @@ static int64_t load_kernel (CPUMIPSState *env)
{ {
int64_t kernel_entry, kernel_low, kernel_high; int64_t kernel_entry, kernel_low, kernel_high;
int index = 0; int index = 0;
long initrd_size; long kernel_size, initrd_size;
ram_addr_t initrd_offset; ram_addr_t initrd_offset;
uint32_t *prom_buf; uint32_t *prom_buf;
long prom_size; long prom_size;
if (load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys, NULL, kernel_size = load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys,
(uint64_t *)&kernel_entry, (uint64_t *)&kernel_low, NULL, (uint64_t *)&kernel_entry,
(uint64_t *)&kernel_high, 0, EM_MIPS, 1, 0) < 0) { (uint64_t *)&kernel_low, (uint64_t *)&kernel_high,
fprintf(stderr, "qemu: could not load kernel '%s'\n", 0, EM_MIPS, 1, 0);
loaderparams.kernel_filename); if (kernel_size < 0) {
error_report("qemu: could not load kernel '%s': %s",
loaderparams.kernel_filename,
load_elf_strerror(kernel_size));
exit(1); exit(1);
} }

14
hw/mips/mips_malta.c
View File

@ -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) static int64_t load_kernel (void)
{ {
int64_t kernel_entry, kernel_high; int64_t kernel_entry, kernel_high;
long initrd_size; long kernel_size, initrd_size;
ram_addr_t initrd_offset; ram_addr_t initrd_offset;
int big_endian; int big_endian;
uint32_t *prom_buf; uint32_t *prom_buf;
@ -808,11 +808,13 @@ static int64_t load_kernel (void)
big_endian = 0; big_endian = 0;
#endif #endif
if (load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys, NULL, kernel_size = load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys,
(uint64_t *)&kernel_entry, NULL, (uint64_t *)&kernel_high, NULL, (uint64_t *)&kernel_entry, NULL,
big_endian, EM_MIPS, 1, 0) < 0) { (uint64_t *)&kernel_high, big_endian, EM_MIPS, 1, 0);
fprintf(stderr, "qemu: could not load kernel '%s'\n", if (kernel_size < 0) {
loaderparams.kernel_filename); error_report("qemu: could not load kernel '%s': %s",
loaderparams.kernel_filename,
load_elf_strerror(kernel_size));
exit(1); exit(1);
} }

5
hw/mips/mips_mipssim.c
View File

@ -78,8 +78,9 @@ static int64_t load_kernel(void)
if ((entry & ~0x7fffffffULL) == 0x80000000) if ((entry & ~0x7fffffffULL) == 0x80000000)
entry = (int32_t)entry; entry = (int32_t)entry;
} else { } else {
fprintf(stderr, "qemu: could not load kernel '%s'\n", error_report("qemu: could not load kernel '%s': %s",
loaderparams.kernel_filename); loaderparams.kernel_filename,
load_elf_strerror(kernel_size));
exit(1); exit(1);
} }

6
hw/mips/mips_r4k.c
View File

@ -31,6 +31,7 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
#include "qemu/error-report.h"
#define MAX_IDE_BUS 2 #define MAX_IDE_BUS 2
@ -96,8 +97,9 @@ static int64_t load_kernel(void)
if ((entry & ~0x7fffffffULL) == 0x80000000) if ((entry & ~0x7fffffffULL) == 0x80000000)
entry = (int32_t)entry; entry = (int32_t)entry;
} else { } else {
fprintf(stderr, "qemu: could not load kernel '%s'\n", error_report("qemu: could not load kernel '%s': %s",
loaderparams.kernel_filename); loaderparams.kernel_filename,
load_elf_strerror(kernel_size));
exit(1); exit(1);
} }