From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3o58-0004z7-2k for qemu-devel@nongnu.org; Mon, 29 Jul 2013 10:05:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3o4z-00057o-J9 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 10:05:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41363 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3o4z-00057M-BP for qemu-devel@nongnu.org; Mon, 29 Jul 2013 10:05:41 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 16:05:31 +0200 Message-Id: <1375106733-832-4-git-send-email-afaerber@suse.de> In-Reply-To: <1375106733-832-1-git-send-email-afaerber@suse.de> References: <1375106733-832-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-1.6 3/5] mips_malta: Silence BIOS loading warning for qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Aurelien Jarno , =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Signed-off-by: Andreas F=C3=A4rber --- hw/mips/mips_malta.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 1589b59..f56f34f 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" =20 //#define DEBUG_BOARD_INIT =20 @@ -1005,7 +1006,8 @@ void mips_malta_init(QEMUMachineInitArgs *args) } else { bios_size =3D -1; } - if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_file= name) { + if ((bios_size < 0 || bios_size > BIOS_SIZE) && + !kernel_filename && !qtest_enabled()) { fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s', a= nd no -kernel argument was specified\n", bios_name); --=20 1.8.1.4