From: Andreas Färber <afaerber@suse.de>
Date: Mon, 29 Jul 2013 16:27:58 +0000 (+0200)
Subject: omap_sx1: Don't enforce use of kernel or flash for qtest
X-Git-Tag: qemu-xen-4.5.0-rc1~380^2~47
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=db3fd06902c96644cb4d4a76f54924c754faf13c;p=qemu-upstream-4.5-testing.git

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

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

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