diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2013-08-03 16:03:18 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2013-08-08 23:06:15 +0200 |
| commit | 2e985fe000e73097e325e18b943e8babfa96c35c (patch) | |
| tree | 466c176c25448c2098d21dce64edef0f38e85088 /hw/mips/mips_mipssim.c | |
| parent | 85711e6bafb1910b50ff181e8507cb904ef7e84d (diff) | |
| download | qemu-2e985fe000e73097e325e18b943e8babfa96c35c.tar.gz | |
mips: revert commit b332d24a8e1290954029814d09156b06ede358e2
Now that this code path is not triggered anymore during the tests,
revert commit b332d24a8e1290954029814d09156b06ede358e2. Booting a MIPS
target without kernel nor bios doesn't really make sense. At the same
time replace fprintf(stderr, ...) by error_report().
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/mips/mips_mipssim.c')
| -rw-r--r-- | hw/mips/mips_mipssim.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index fea1a15916..297f01e268 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -37,6 +37,7 @@ #include "elf.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" +#include "qemu/error-report.h" static struct _loaderparams { int ram_size; @@ -191,9 +192,9 @@ mips_mipssim_init(QEMUMachineInitArgs *args) } if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) { /* Bail out if we have neither a kernel image nor boot vector code. */ - fprintf(stderr, - "qemu: Warning, could not load MIPS bios '%s', and no -kernel argument was specified\n", - filename); + error_report("Could not load MIPS bios '%s', and no " + "-kernel argument was specified", filename); + exit(1); } else { /* We have a boot vector start address. */ env->active_tc.PC = (target_long)(int32_t)0xbfc00000; |