commit db3fd06902c96644cb4d4a76f54924c754faf13c
author Andreas Färber <afaerber@suse.de> Mon Jul 29 18:27:58 2013 +0200
committer Andreas Färber <afaerber@suse.de> Tue Nov 05 17:47:29 2013 +0100
tree e933755737298c5eff3e7522584932a959cb4532
parent 1ca8334e42d84cf246db88502cebf11042df2c51

omap_sx1: Don't enforce use of kernel or flash for qtest

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

hw/arm/omap_sx1.c

diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index 03b3816..3ba263a 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -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 @@
                                 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);
     }