[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/58] omap_sx1: Don't enforce use of kernel or flash
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 09/58] omap_sx1: Don't enforce use of kernel or flash for qtest |
Date: |
Tue, 8 Oct 2013 19:44:07 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/arm/omap_sx1.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 @@ 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);
}
--
1.8.1.4
- [Qemu-devel] [PULL 17/58] shix: Don't require firmware presence for qtest, (continued)
- [Qemu-devel] [PULL 17/58] shix: Don't require firmware presence for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 08/58] palm: Don't enforce loading ROM or kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 04/58] puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 07/58] z2: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 40/58] realview_gic: Convert to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 51/58] qom: Include error.h directly in object.h, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 34/58] a9scu: Build only once, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 35/58] arm11mpcore: Fix typo in MemoryRegion name, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 26/58] arm_mptimer: Convert to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 10/58] exynos4_boards: Silence lack of -smp 2 warning for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 09/58] omap_sx1: Don't enforce use of kernel or flash for qtest,
Andreas Färber <=
- [Qemu-devel] [PULL 36/58] arm11mpcore: Drop unused fields, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 42/58] arm11mpcore: Convert mpcore_rirq_state to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 33/58] a15mpcore: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 44/58] arm11mpcore: Split off RealView MPCore, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 25/58] a9mpcore: Embed A9SCUState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 43/58] arm11mpcore: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 57/58] ide: Drop ide_init2_with_non_qdev_drives(), Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 27/58] a9mpcore: Embed ARMMPTimerState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 18/58] leon3: Don't enforce use of -bios with qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 49/58] qdev-monitor: Avoid qdev as variable name, Andreas Färber, 2013/10/08