Patchwork [for-1.6,5/5] mips_r4k: Silence BIOS loading warning for qtest

login
register
mail settings
Submitter Andreas Färber
Date July 29, 2013, 2:05 p.m.
Message ID <1375106733-832-6-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/262780/
State New
Headers show

Comments

Andreas Färber - July 29, 2013, 2:05 p.m.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/mips/mips_r4k.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 7af08b8..044f232 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);