mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

leon3: fix the error message when no bios are provided

Browse Source 
The leon3 board is looking for u-boot.bin by default (LEON3_PROM_FILENAME)..
But in the case this file is not found and no other file are given on the
command line we get the following error:

  $ ./qemu-system-sparc -M leon3_generic
  qemu-system-sparc: Can't read bios image (null)

So use LEON3_PROM_FILENAME instead of filename in case it is NULL to get a
less cryptic message:

  $ ./qemu-system-sparc -M leon3_generic
  qemu-system-sparc: Can't read bios image 'u-boot.bin'

Suggested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: KONRAD Frederic <frederic.konrad@adacore.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
KONRAD Frederic 2019-05-15 14:31:27 +02:00 committed by Mark Cave-Ayland
parent 6b99a110c7
commit bd30132cd8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/sparc/leon3.c
View File

@ -1,7 +1,7 @@
/*
* QEMU Leon3 System Emulator
*
* Copyright (c) 2010-2011 AdaCore
* Copyright (c) 2010-2019 AdaCore
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -43,7 +43,7 @@
/* Default system clock. */
#define CPU_CLK (40 * 1000 * 1000)
#define PROM_FILENAME "u-boot.bin"
#define LEON3_PROM_FILENAME "u-boot.bin"
#define MAX_PILS 16
@ -158,7 +158,7 @@ static void leon3_generic_hw_init(MachineState *machine)
/* Load boot prom */
if (bios_name == NULL) {
bios_name = PROM_FILENAME;
bios_name = LEON3_PROM_FILENAME;
}
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
@ -180,7 +180,9 @@ static void leon3_generic_hw_init(MachineState *machine)
exit(1);
}
} else if (kernel_filename == NULL && !qtest_enabled()) {
error_report("Can't read bios image %s", filename);
error_report("Can't read bios image '%s'", filename
? filename
: LEON3_PROM_FILENAME);
exit(1);
}
g_free(filename);