summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-07-29 18:48:58 +0200
committerAndreas Färber <afaerber@suse.de>2013-11-05 17:47:29 +0100
commit19c82aac7540acdd4645b033bb99ceff960f9570 (patch)
treee4f972136ed025560a665271f793b63b9bd2caee
parent5c12762c2d9cfc7ff9744e4af14ef35190c5369b (diff)
downloadfocaccia-qemu-19c82aac7540acdd4645b033bb99ceff960f9570.tar.gz
focaccia-qemu-19c82aac7540acdd4645b033bb99ceff960f9570.zip
an5206: Don't enforce use of kernel for qtest
Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--hw/m68k/an5206.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index a8eee44e62..24f2068559 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -12,6 +12,7 @@
 #include "hw/loader.h"
 #include "elf.h"
 #include "exec/address-spaces.h"
+#include "sysemu/qtest.h"
 
 #define KERNEL_LOAD_ADDR 0x10000
 #define AN5206_MBAR_ADDR 0x10000000
@@ -62,6 +63,9 @@ static void an5206_init(QEMUMachineInitArgs *args)
 
     /* Load kernel.  */
     if (!kernel_filename) {
+        if (qtest_enabled()) {
+            return;
+        }
         fprintf(stderr, "Kernel image must be specified\n");
         exit(1);
     }