qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, "Aurelien Jarno" <aurelien@aurel32.net>,
	"Andreas Färber" <afaerber@suse.de>,
	anthony@codemonkey.ws
Subject: [Qemu-devel] [PATCH for-1.6 5/5] mips_r4k: Silence BIOS loading warning for qtest
Date: Mon, 29 Jul 2013 16:05:33 +0200	[thread overview]
Message-ID: <1375106733-832-6-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1375106733-832-1-git-send-email-afaerber@suse.de>

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

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);
-- 
1.8.1.4

  parent reply	other threads:[~2013-07-29 14:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-29 14:05 [Qemu-devel] [PATCH for-1.6 0/5] qtest: Output cleanup Andreas Färber
2013-07-29 14:05 ` [Qemu-devel] [PATCH for-1.6 1/5] target-ppc: Suppress TCG instruction emulation warnings for qtest Andreas Färber
2013-07-29 14:05 ` [Qemu-devel] [PATCH for-1.6 2/5] mips_fulong2e: Silence BIOS loading warning " Andreas Färber
2013-07-29 14:05 ` [Qemu-devel] [PATCH for-1.6 3/5] mips_malta: " Andreas Färber
2013-07-29 14:05 ` [Qemu-devel] [PATCH for-1.6 4/5] mips_jazz: " Andreas Färber
2013-07-29 14:05 ` Andreas Färber [this message]
2013-07-30 13:18 ` [Qemu-devel] [PATCH for-1.6 0/5] qtest: Output cleanup Anthony Liguori
2013-08-02 12:35 ` Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375106733-832-6-git-send-email-afaerber@suse.de \
    --to=afaerber@suse.de \
    --cc=anthony@codemonkey.ws \
    --cc=aurelien@aurel32.net \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).