proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-06-23 18:07:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mips: revert commit b332d24a8e

Browse Source 
Now that this code path is not triggered anymore during the tests,
revert commit b332d24a8e. 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>
This commit is contained in:
Aurelien Jarno 2013-08-03 16:03:18 +02:00
parent 85711e6baf
commit 2e985fe000
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/mips/mips_fulong2e.c
View File

@ -44,6 +44,7 @@
#include "sysemu/blockdev.h" #include "sysemu/blockdev.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 DEBUG_FULONG2E_INIT #define DEBUG_FULONG2E_INIT
@ -335,7 +336,8 @@ static void mips_fulong2e_init(QEMUMachineInitArgs *args)
if ((bios_size < 0 || bios_size > BIOS_SIZE) && if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
!kernel_filename && !qtest_enabled()) { !kernel_filename && !qtest_enabled()) {
fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n", bios_name); error_report("Could not load MIPS bios '%s'", bios_name);
exit(1);
} }
} }

5
hw/mips/mips_jazz.c
View File

@ -43,6 +43,7 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
#include "qemu/error-report.h"
enum jazz_model_e enum jazz_model_e
{ {
@ -178,8 +179,8 @@ static void mips_jazz_init(MemoryRegion *address_space,
bios_size = -1; bios_size = -1;
} }
if ((bios_size < 0 || bios_size > MAGNUM_BIOS_SIZE) && !qtest_enabled()) { if ((bios_size < 0 || bios_size > MAGNUM_BIOS_SIZE) && !qtest_enabled()) {
fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n", error_report("Could not load MIPS bios '%s'", bios_name);
bios_name); exit(1);
} }
/* Init CPU internal devices */ /* Init CPU internal devices */

7
hw/mips/mips_malta.c
View File

@ -49,6 +49,7 @@
#include "hw/sysbus.h" /* SysBusDevice */ #include "hw/sysbus.h" /* SysBusDevice */
#include "qemu/host-utils.h" #include "qemu/host-utils.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
#include "qemu/error-report.h"
//#define DEBUG_BOARD_INIT //#define DEBUG_BOARD_INIT
@ -1008,9 +1009,9 @@ void mips_malta_init(QEMUMachineInitArgs *args)
} }
if ((bios_size < 0 || bios_size > BIOS_SIZE) && if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
!kernel_filename && !qtest_enabled()) { !kernel_filename && !qtest_enabled()) {
fprintf(stderr, error_report("Could not load MIPS bios '%s', and no "
"qemu: Warning, could not load MIPS bios '%s', and no -kernel argument was specified\n", "-kernel argument was specified", bios_name);
bios_name); exit(1);
} }
} }
/* In little endian mode the 32bit words in the bios are swapped, /* In little endian mode the 32bit words in the bios are swapped,

7
hw/mips/mips_mipssim.c
View File

@ -37,6 +37,7 @@
#include "elf.h" #include "elf.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "qemu/error-report.h"
static struct _loaderparams { static struct _loaderparams {
int ram_size; int ram_size;
@ -191,9 +192,9 @@ mips_mipssim_init(QEMUMachineInitArgs *args)
} }
if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) { if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) {
/* Bail out if we have neither a kernel image nor boot vector code. */ /* Bail out if we have neither a kernel image nor boot vector code. */
fprintf(stderr, error_report("Could not load MIPS bios '%s', and no "
"qemu: Warning, could not load MIPS bios '%s', and no -kernel argument was specified\n", "-kernel argument was specified", filename);
filename); exit(1);
} else { } else {
/* We have a boot vector start address. */ /* We have a boot vector start address. */
env->active_tc.PC = (target_long)(int32_t)0xbfc00000; env->active_tc.PC = (target_long)(int32_t)0xbfc00000;