omap_sx1: Don't enforce use of kernel or flash for qtest
authorAndreas Färber <afaerber@suse.de>
Mon, 29 Jul 2013 16:27:58 +0000 (18:27 +0200)
committerAndreas Färber <afaerber@suse.de>
Tue, 5 Nov 2013 16:47:29 +0000 (17:47 +0100)
Signed-off-by: Andreas Färber <afaerber@suse.de>
hw/arm/omap_sx1.c

index 03b381688bde99182645907c52a8d7f1a008f7f4..3ba263ab4dd530d3c5eefc1d1876802eda749ad1 100644 (file)
@@ -32,6 +32,7 @@
 #include "hw/arm/arm.h"
 #include "hw/block/flash.h"
 #include "sysemu/blockdev.h"
+#include "sysemu/qtest.h"
 #include "exec/address-spaces.h"
 
 /*****************************************************************************/
@@ -188,7 +189,7 @@ static void sx1_init(QEMUMachineInitArgs *args, const int version)
                                 OMAP_CS1_BASE, &cs[1]);
     }
 
-    if (!args->kernel_filename && !fl_idx) {
+    if (!args->kernel_filename && !fl_idx && !qtest_enabled()) {
         fprintf(stderr, "Kernel or Flash image must be specified\n");
         exit(1);
     }