[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/18] omap_sx1: Don't enforce use of kernel or f
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v3 08/18] omap_sx1: Don't enforce use of kernel or flash for qtest |
Date: |
Mon, 23 Sep 2013 15:35:42 +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 b0f8664..235fed8 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] [PATCH v3 00/18] qtest: Test all targets, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 14/18] milkymist: Suppress -kernel/-bios/-drive error for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 02/18] arm/boot: Turn arm_load_kernel() into no-op for qtest without -kernel, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 06/18] z2: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 16/18] shix: Don't require firmware presence for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 03/18] puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 09/18] exynos4_boards: Silence lack of -smp 2 warning for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 12/18] mcf5208: Don't enforce use of kernel for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 08/18] omap_sx1: Don't enforce use of kernel or flash for qtest,
Andreas Färber <=
- [Qemu-devel] [PATCH v3 05/18] gumstix: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 07/18] palm: Don't enforce loading ROM or kernel for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 10/18] armv7m: Don't enforce use of kernel for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 11/18] axis_dev88: Don't enforce use of kernel for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 15/18] shix: Drop debug output, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 13/18] an5206: Don't enforce use of kernel for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 01/18] mips_mipssim: Silence BIOS loading warning for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 04/18] mainstone: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 18/18] qtest: Prepare QOM machine tests, Andreas Färber, 2013/09/23