[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.6? 02/14] arm/boot: Turn arm_load_kernel() int
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.6? 02/14] arm/boot: Turn arm_load_kernel() into no-op for qtest without -kernel |
Date: |
Mon, 29 Jul 2013 19:15:29 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/arm/boot.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 2cbeefd..0c6d611 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -15,6 +15,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "sysemu/device_tree.h"
+#include "sysemu/qtest.h"
#include "qemu/config-file.h"
#define KERNEL_ARGS_ADDR 0x100
@@ -354,6 +355,9 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info
*info)
/* Load the kernel. */
if (!info->kernel_filename) {
+ if (qtest_enabled()) {
+ return;
+ }
fprintf(stderr, "Kernel image must be specified\n");
exit(1);
}
--
1.8.1.4
- [Qemu-devel] [PATCH for-1.6? 00/14] qtest: Test all targets, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 01/14] mips_mipssim: Silence BIOS loading warning for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 07/14] omap_sx1: Don't enforce use of kernel or flash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 10/14] axis_dev88: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 12/14] mcf5208: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 03/14] mainstone: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 02/14] arm/boot: Turn arm_load_kernel() into no-op for qtest without -kernel,
Andreas Färber <=
- [Qemu-devel] [PATCH for-1.6? 05/14] z2: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 06/14] palm: Don't enforce loading ROM or kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 09/14] armv7m: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 13/14] an5206: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 04/14] gumstix: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 14/14] qtest: Add dummy machine tests, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 11/14] puv3: Don't assert kernel filename for qtest, Andreas Färber, 2013/07/29