summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-07-29 16:05:33 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-30 18:48:22 -0500
commitc9dd6a9fa092827c38d21749a453bc56413411d7 (patch)
tree556c2ab02c42759d8f3f97886620967a0a1858d9
parent38c8894fe77c14c6af415c75f043370264f89382 (diff)
downloadfocaccia-qemu-c9dd6a9fa092827c38d21749a453bc56413411d7.tar.gz
focaccia-qemu-c9dd6a9fa092827c38d21749a453bc56413411d7.zip
mips_r4k: 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-6-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/mips/mips_r4k.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 7af08b8d0f..044f232de0 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -26,6 +26,7 @@
 #include "hw/timer/i8254.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
+#include "sysemu/qtest.h"
 
 #define MAX_IDE_BUS 2
 
@@ -244,8 +245,7 @@ void mips_r4k_init(QEMUMachineInitArgs *args)
                                    4, 0, 0, 0, 0, be)) {
             fprintf(stderr, "qemu: Error registering flash memory.\n");
 	}
-    }
-    else {
+    } else if (!qtest_enabled()) {
 	/* not fatal */
         fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n",
 		bios_name);