summaryrefslogtreecommitdiff
path: root/hw/mips
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-07-29 16:05:31 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-30 18:48:22 -0500
commit2c57bd9b06e5771c11a1850e709b595a7c283e83 (patch)
tree6fc7e4803190d0e21667e37e8a2631825cb9a7e3 /hw/mips
parent4a7ed999a7a5057d860b38c6680a1437945b5139 (diff)
downloadqemu-2c57bd9b06e5771c11a1850e709b595a7c283e83.tar.gz
mips_malta: Silence BIOS loading warning for qtest
Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Andreas Färber <afaerber@suse.de> Message-id: 1375106733-832-4-git-send-email-afaerber@suse.de Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mips')
-rw-r--r--hw/mips/mips_malta.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 1589b59194..f56f34f3e6 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -48,6 +48,7 @@
#include "exec/address-spaces.h"
#include "hw/sysbus.h" /* SysBusDevice */
#include "qemu/host-utils.h"
+#include "sysemu/qtest.h"
//#define DEBUG_BOARD_INIT
@@ -1005,7 +1006,8 @@ void mips_malta_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()) {
fprintf(stderr,
"qemu: Warning, could not load MIPS bios '%s', and no -kernel argument was specified\n",
bios_name);