From: Andreas Färber <afaerber@suse.de>
Date: Mon, 29 Jul 2013 16:43:57 +0000 (+0200)
Subject: puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel
X-Git-Tag: qemu-xen-4.5.0-rc1~380^2~52
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f741a26c126448adebee7b85fc87b72176c3dfa5;p=qemu-upstream-4.5-testing.git

puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel

Replacing the assert() with more user-friendly error handling is left
for a follow-up.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index a9000617b..e05cbc131 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 */