diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-07-29 18:27:58 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-11-05 17:47:29 +0100 |
| commit | db3fd06902c96644cb4d4a76f54924c754faf13c (patch) | |
| tree | e933755737298c5eff3e7522584932a959cb4532 /hw/arm/omap_sx1.c | |
| parent | 1ca8334e42d84cf246db88502cebf11042df2c51 (diff) | |
| download | focaccia-qemu-db3fd06902c96644cb4d4a76f54924c754faf13c.tar.gz focaccia-qemu-db3fd06902c96644cb4d4a76f54924c754faf13c.zip | |
omap_sx1: Don't enforce use of kernel or flash for qtest
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | hw/arm/omap_sx1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 03b381688b..3ba263ab4d 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); } |