From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6KpJ-0005VM-Vt for qemu-devel@nongnu.org; Mon, 05 Aug 2013 09:28:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6Kp2-0000b3-Fv for qemu-devel@nongnu.org; Mon, 05 Aug 2013 09:27:57 -0400 Received: from cantor2.suse.de ([195.135.220.15]:54441 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6Kp2-0000am-9U for qemu-devel@nongnu.org; Mon, 05 Aug 2013 09:27:40 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 5 Aug 2013 15:27:26 +0200 Message-Id: <1375709247-10002-21-git-send-email-afaerber@suse.de> In-Reply-To: <1375709247-10002-1-git-send-email-afaerber@suse.de> References: <1375709247-10002-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? v2 20/21] leon3: Don't enforce use of -bios with qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Fabien Chouteau Signed-off-by: Andreas F=C3=A4rber --- hw/sparc/leon3.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 5ef282f..1d60cb7 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -26,6 +26,7 @@ #include "hw/ptimer.h" #include "sysemu/char.h" #include "sysemu/sysemu.h" +#include "sysemu/qtest.h" #include "hw/boards.h" #include "hw/loader.h" #include "elf.h" @@ -178,7 +179,7 @@ static void leon3_generic_hw_init(QEMUMachineInitArgs= *args) fprintf(stderr, "qemu: could not load prom '%s'\n", filename= ); exit(1); } - } else if (kernel_filename =3D=3D NULL) { + } else if (kernel_filename =3D=3D NULL && !qtest_enabled()) { fprintf(stderr, "Can't read bios image %s\n", filename); exit(1); } --=20 1.8.1.4