From f741a26c126448adebee7b85fc87b72176c3dfa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 18:43:57 +0200 Subject: puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replacing the assert() with more user-friendly error handling is left for a follow-up. Signed-off-by: Andreas Färber --- hw/unicore32/puv3.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'hw/unicore32') diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index a9000617b4..e05cbc131e 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" #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" @@ -84,6 +85,9 @@ static void puv3_load_kernel(const char *kernel_filename) { int size; + if (kernel_filename == NULL && qtest_enabled()) { + return; + } assert(kernel_filename != NULL); /* only zImage format supported */ -- cgit v1.2.1