From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3r35-0006hZ-HK for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:16:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3r2x-0003zE-Rj for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:15:55 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48962 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3r2x-0003yV-Gf for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:15:47 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 19:15:38 +0200 Message-Id: <1375118141-8550-12-git-send-email-afaerber@suse.de> In-Reply-To: <1375118141-8550-1-git-send-email-afaerber@suse.de> References: <1375118141-8550-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? 11/14] puv3: Don't assert kernel filename for qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Guan Xuetao , =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Replacing the assert() with more user-friendly error handling is left for another time. Signed-off-by: Andreas F=C3=A4rber --- hw/unicore32/puv3.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 5ff0dc9..f99cf8e 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -17,6 +17,7 @@ #include "hw/boards.h" #include "hw/loader.h" #include "hw/i386/pc.h" +#include "sysemu/qtest.h" =20 #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" @@ -84,6 +85,9 @@ static void puv3_load_kernel(const char *kernel_filenam= e) { int size; =20 + if (qtest_enabled()) { + return; + } assert(kernel_filename !=3D NULL); =20 /* only zImage format supported */ --=20 1.8.1.4