diff options
| author | Andreas Färber | 2013-07-29 17:01:37 +0200 |
|---|---|---|
| committer | Andreas Färber | 2013-11-05 17:47:28 +0100 |
| commit | 22d5523d3fbb95264055e11eb47738a7442a4ecb (patch) | |
| tree | 2eea47f5bb1373b306fa7ba65b9cb1d4d99ef58a /hw | |
| parent | Merge tag 'for_anthony' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu (diff) | |
| download | qemu-22d5523d3fbb95264055e11eb47738a7442a4ecb.tar.gz qemu-22d5523d3fbb95264055e11eb47738a7442a4ecb.tar.xz qemu-22d5523d3fbb95264055e11eb47738a7442a4ecb.zip | |
mips_mipssim: Silence BIOS loading warning for qtest
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/mips/mips_mipssim.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index 242bab9779..239aa6ac8c 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -38,6 +38,7 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" +#include "sysemu/qtest.h" static struct _loaderparams { int ram_size; @@ -190,7 +191,8 @@ mips_mipssim_init(QEMUMachineInitArgs *args) } else { bios_size = -1; } - if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) { + if ((bios_size < 0 || bios_size > BIOS_SIZE) && + !kernel_filename && !qtest_enabled()) { /* Bail out if we have neither a kernel image nor boot vector code. */ error_report("Could not load MIPS bios '%s', and no " "-kernel argument was specified", filename); |
